Rename method

Change-Id: I468f67a76e9aa7132456aa30b79c66a3fcffa227
Revision and add further methods

Change-Id: If4259a0507a84bf512aebb6d34d7d04189d61fa1