Class name clean up.