Rename files for consistency.

Test: CTS (API2 tests)

Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b
3 files changed