more complete rename
quick hardening in response to https://github.com/prabhasp/formhub.R/issues/7