Naming conventions cleanup