Fixing a naming leak