make local function names more meaningful
make local function names more meaningful

Signed-off-by: Marcello Seri <34fd14c67154e888f6587d5c0e7eadd13aaf7ca7@citrix.com>

thomassa/xen-api,Frezzle/xen-api,euanh/xen-api,thomassa/xen-api,euanh/xen-api,Frezzle/xen-api,Frezzle/xen-api,thomassa/xen-api,srowe/xen-api,thomassa/xen-api,thomassa/xen-api,srowe/xen-api,euanh/xen-api,thomassa/xen-api,srowe/xen-api,euanh/xen-api,euanh/xen-api,Frezzle/xen-api,srowe/xen-api,Frezzle/xen-api,srowe/xen-api,euanh/xen-api