Fix name change bug