Cleaned up namespaces and class names.