Refactored to follow naming convention