Fixing a naming convention