refactoring to adhere to naming conventions