Add missing aliases

Change-Id: I2287286ae52dff35b9c12060f3f19d7409c35986