some refactoring around names