diff --git a/helper/labelGenerator.js b/helper/labelGenerator.js
index 422c3409..96fe5d09 100644
--- a/helper/labelGenerator.js
+++ b/helper/labelGenerator.js
@@ -16,7 +16,7 @@ module.exports = function( record ){
   var buildOutput = function(parts, schemaArr, record) {
     for (var i=0; i<schemaArr.length; i++) {
       var fieldValue = record[schemaArr[i]];
-      if (check.unemptyString(fieldValue) && !_.includes(parts, fieldValue)) {
+      if (check.nonEmptyString(fieldValue) && !_.includes(parts, fieldValue)) {
         parts.push( fieldValue );
         return parts;
       }
diff --git a/sanitiser/_boundary_country.js b/sanitiser/_boundary_country.js
index ef965c2c..9bdceac2 100644
--- a/sanitiser/_boundary_country.js
+++ b/sanitiser/_boundary_country.js
@@ -13,7 +13,7 @@ function sanitize(raw, clean) {
   if (check.assigned(country)){
 
     // must be valid string
-    if (!check.unemptyString(country)) {
+    if (!check.nonEmptyString(country)) {
       messages.errors.push('boundary.country is not a string');
     }
 
diff --git a/sanitiser/_categories.js b/sanitiser/_categories.js
index e76e8767..29737922 100644
--- a/sanitiser/_categories.js
+++ b/sanitiser/_categories.js
@@ -11,7 +11,7 @@ function sanitize( raw, clean ){
   clean.categories = [];
 
   // if categories string has been set
-  if( check.unemptyString( raw.categories ) ){
+  if( check.nonEmptyString( raw.categories ) ){
 
     // map input categories to valid format
     clean.categories = raw.categories.split(',')
diff --git a/sanitiser/_ids.js b/sanitiser/_ids.js
index 12f83972..df879b94 100644
--- a/sanitiser/_ids.js
+++ b/sanitiser/_ids.js
@@ -63,7 +63,7 @@ function sanitize( raw, clean ){
   // error & warning messages
   var messages = { errors: [], warnings: [] };
 
-  if (!check.unemptyString( raw.ids )) {
+  if (!check.nonEmptyString( raw.ids )) {
     messages.errors.push( lengthError);
     return messages;
   }
@@ -75,7 +75,7 @@ function sanitize( raw, clean ){
   rawIds = _.unique(rawIds);
 
   // ensure all elements are valid non-empty strings
-  if (!rawIds.every(check.unemptyString)) {
+  if (!rawIds.every(check.nonEmptyString)) {
       messages.errors.push( lengthError );
   }
 
diff --git a/sanitiser/_source.js b/sanitiser/_source.js
index c1f98bcc..6a4661dd 100644
--- a/sanitiser/_source.js
+++ b/sanitiser/_source.js
@@ -16,7 +16,7 @@ function sanitize( raw, clean ) {
 
   // default case (no layers specified in GET params)
   // don't even set the from_layers key in this case
-  if( check.unemptyString( raw.source ) ){
+  if( check.nonEmptyString( raw.source ) ){
 
     var sources = raw.source.split(',');
 
diff --git a/sanitiser/_targets.js b/sanitiser/_targets.js
index 81e345b6..734bd919 100644
--- a/sanitiser/_targets.js
+++ b/sanitiser/_targets.js
@@ -24,11 +24,11 @@ function sanitize( raw, clean, opts ) {
   var targetsString = raw[opts.paramName];
 
   // trim whitespace
-  if( check.unemptyString( targetsString ) ){
+  if( check.nonEmptyString( targetsString ) ){
     targetsString = targetsString.trim();
 
     // param must be a valid non-empty string
-    if( !check.unemptyString( targetsString ) ){
+    if( !check.nonEmptyString( targetsString ) ){
       messages.errors.push(
         opts.paramName + ' parameter cannot be an empty string. Valid options: ' + opts.targetMapKeysString
       );
diff --git a/sanitiser/_text.js b/sanitiser/_text.js
index 824c7a87..53898ff0 100644
--- a/sanitiser/_text.js
+++ b/sanitiser/_text.js
@@ -8,7 +8,7 @@ function sanitize( raw, clean ){
   var messages = { errors: [], warnings: [] };
 
   // invalid input 'text'
-  if( !check.unemptyString( raw.text ) ){
+  if( !check.nonEmptyString( raw.text ) ){
     messages.errors.push('invalid param \'text\': text length, must be >0');
   }