Fix remaining old api names