refactor naming conventions