Uuid->UUID renaming