basic naming and the refactoring needed for it

Change-Id: I2123a4ad8266481755c045a356abddebac9f2efb
basic naming

Change-Id: Ic77c76b9b0357fe541852346490ffafd7c7a9188