renamed all _that instances to relevant var names
renamed all _that instances to relevant var names

smn/onadata,mainakibui/kobocat,ehealthafrica-ci/onadata,GeoODK/onadata,eHealthAfrica/onadata,piqoni/onadata,piqoni/onadata,sounay/flaminggo-test,kobotoolbox/kobocat,spatialdev/onadata,GeoODK/onadata,spatialdev/onadata,sounay/flaminggo-test,kobotoolbox/kobocat,smn/onadata,hnjamba/onaclone,ehealthafrica-ci/onadata,sounay/flaminggo-test,sounay/flaminggo-test,spatialdev/onadata,piqoni/onadata,smn/onadata,kobotoolbox/kobocat,GeoODK/onadata,spatialdev/onadata,mainakibui/kobocat,jomolinare/kobocat,jomolinare/kobocat,GeoODK/onadata,qlands/onadata,hnjamba/onaclone,eHealthAfrica/onadata,jomolinare/kobocat,mainakibui/kobocat,ehealthafrica-ci/onadata,awemulya/fieldsight-kobocat,eHealthAfrica/onadata,ehealthafrica-ci/onadata,hnjamba/onaclone,mainakibui/kobocat,qlands/onadata,jomolinare/kobocat,awemulya/fieldsight-kobocat,smn/onadata,piqoni/onadata,awemulya/fieldsight-kobocat,qlands/onadata,kobotoolbox/kobocat,awemulya/fieldsight-kobocat,qlands/onadata,hnjamba/onaclone