Rename functions

Change-Id: I06651d8527efa0a51b61804b3921785dc384fb08
new functions

Change-Id: I20af09ccbcc701700baf66d0cf2c16ed5dc153f2