Update Class names to camelcase