Update how entities are identified by their unique keys, to prevent clashing and duplicates