refactored code base with new naming conventions