Update to support UUIDs (Name changing)

Changing the storage system to support name changing.