Refactoring to more consistent naming