Fixed class namespaces.