Small naming refactoring