Remove usage of EntityId class alias

Change-Id: Icd7adeb6d0d13fbf9716cb2e409dea9f7067c06d