naming convention refactor