Renamed some classes and methods in preparation for importing Collections.  Story #162