Rename entity with ltk refactoring

Change-Id: I0d132345311f3e25fb37cbf01d82eff96a7834ed