Started refactoring naming conventions