Get rid of many getPrefixedEtity id usages in repo

Change-Id: Ieddc5a6b8ec48fbd3fafc4f365944c401ac4300d