Update namespaced tags to be more specific