renamed classes

Change-Id: I4d7735302bd883650e16654d28f57526c4aeafd9