More naming convention refactoring.