Renamed Uid properties to UniqueId