Let's not rename things and reduce their functionality arbitrarily.

Change-Id: I995b693a616737e3c6c92cf3cbc760cbc04187ec