Fixes a generic oft-used entity name to indicate name rather than object name

Change-Id: I285472c16f9be670bf92f691577afd63254d6afb
Fixes-bug: 1342750
Merge "Fixes a generic oft-used entity name to indicate name rather than object name"