Rename to keep commit history

Change-Id: Ib68ac6a509180625f69b7920590b6d7037d3d56e