Go overzealous with name change