Renamed Classes, added dependencies, removed some camel case parameter names