made some fine ajustements and renamed some functions

Change-Id: Ifa55f885e2ec187aa8cc13d69346d5ef4ad3e35d