Refactored the naming convention