Updating nomenclature.

Change-Id: I0ba8827841509599ab3394235e55797f5c3c8f9f
Merge "Updating nomenclature."