Renamed classes and namespaces