Changing names for objects so that they match the UML guide, and standard naming across the classes.  Minor clean-up.