some name convention refactoring