Rename file to match class name

Change-Id: I7b58a4992d54775f7be5f9003b9e623450326a0a
Merge "Rename file to match class name"