refactoring for consistent naming