Namespaced things correctly