Merge "Change naming to be more specific" am: 24b58ed995 am: 25dfef2df8 am: 980e2f799e

Change-Id: I048885c130937065d04fbff747ee7225db5bf92b