Renaming some of the class to take better advantage of the namespacing, eliminating redundancy