Refactoring to provide more logical naming