refactor naming convention