refactoring to support consistent names