Namespaced everything for 2.1