Renamed namespaces to CamelCase