Name chnage cleanup.