Fixed the agressive name changing