refactoring and renaming

Change-Id: I3f6521943fc09a070ebe251a77d3de755e54e898