Cleaned up method names to be more concise
Updated tests to match method renaming.  Still needs reviewed