namespace fix and uuid