R2 patients previously taking NFV switch to EFV; those randomized to EFV switch to NFV; the additional NRTIs change to stavudine (d4T) and didanosine (ddI). Therapy is continued for an additional 24 weeks.