Merge "Change naming to be more specific" am: 24b58ed995

Change-Id: Ib6bd3502351ae962cd982648748c3a029bc78a03