DO NOT MERGE: Fixing Entities

This will make name conflicts much more likely. I've encountered cases where, for example, you cannot create two entities with the same name. Of course, when populating fields with such a restriction, it's best not to rely on random data. It would be better to use some function/method that spits out a unique value each time it's called.