reverting to old names, adding namespaces