Move away from HIV and AIDS? Not quite yet!