Rename file to be more consistent.

Change-Id: I53df4c9fd053964842190f85c09054ae7720e1c8