Fix name change problem.