Updated namespaces and class names.