Fixed function names.
Merge branch 'develop' of github.com:OS2web/os2web_webform into develop
Fixed function names.