Namespace changes

May not work with slugs.