Renaming and rebasing internal API

Change-Id: I9de75aa7a831b6eb9c213dd637ce9e2b68d2b047
Signed-off-by: TanelDettenborn <tanel.dettenborn@intel.com>