Some renaming

Change-Id: Ib080e8793d360186b5f017d882f001955e4a0edf