Naming convention correction