UUIDs never change while namespaces do and with this change we would avoid having to maintain the namespaces inside of the map when they are renamed.

The change will need to be made here.