Revert "Replaced Entity IDs with Names"

This reverts commit 99098ddfbc3c1394c60a8d665e02c4d5a7776431.