Finish making everything obvious work
Oops!
Return to old namespaces