Renamed some classes and interfaces.

Change-Id: I5e7577cc4e590533a086fcefaaa89442904ef991