some refactoring for names