Implemented changes based on new naming convention