Rename classes and remove namespaces