refactoring internal naming