Rename EntityUsageIndex to ItemUsageIndex and cleanup

Change-Id: I57586ae6e8d77baaa70cab83193adb9100964c93