More naming refactoring