Refactoring to adopt a more streamlined consistent naming scheme