Changes to confirm to new conventions for collection and classname definiton