Changed object names to CamelCase