Refactor for naming conventions