Rename some of the crazier 'Enterprise' class names.