Renaming files to follow name conventions

And renamed the inner class name.

Change-Id: I2ed94a61214439d5c70d04bd1dbddd68754b595e
Merge "Renaming files to follow name conventions"