Naming convention cleanup