refactoring: naming conventions