Progress on name replacement