Function name changed and more small corrections
Merge branch 'master' of github.com:ovdesktop/ovdesktkop-client