EXP-87. Removes use of table URIs in EntityIds.

Reviewed by: robertchu