diff --git a/src/common/utils/index.js b/src/common/utils/index.js
index 9d20b555..b776bcc8 100644
--- a/src/common/utils/index.js
+++ b/src/common/utils/index.js
@@ -1,7 +1,7 @@
 export { default as includes } from './includes';
 export { default as isNil } from './is-nil';
 export { default as isObject } from './is-object';
-export { default as omitEmptyAndNil } from './omit-empty-and-nil';
+export { default as omitEmptyStringAndNil } from './omit-emptystring-and-nil';
 export { default as omitNil } from './omit-nil';
 export { default as omitProperty } from './omit-property';
 export { default as toNumber } from './to-number';
diff --git a/src/common/utils/is-empty-or-nil.js b/src/common/utils/is-empty-or-nil.js
deleted file mode 100644
index 2d9b344b..00000000
--- a/src/common/utils/is-empty-or-nil.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import isEmpty from './is-empty';
-import isNil from './is-nil';
-
-/**
- * @param {*} value
- * @returns {boolean}
- */
-export default function isEmptyOrNil(value) {
-    return isEmpty(value) || isNil(value);
-}
diff --git a/src/common/utils/is-empty.js b/src/common/utils/is-empty-string.js
similarity index 62%
rename from src/common/utils/is-empty.js
rename to src/common/utils/is-empty-string.js
index d0ac0c90..56df1449 100644
--- a/src/common/utils/is-empty.js
+++ b/src/common/utils/is-empty-string.js
@@ -2,6 +2,6 @@
  * @param {*} value
  * @returns {boolean}
  */
-export default function isEmpty(value) {
+export default function isEmptyString(value) {
     return value === '';
 }
diff --git a/src/common/utils/is-emptystring-or-nil.js b/src/common/utils/is-emptystring-or-nil.js
new file mode 100644
index 00000000..bf4cf052
--- /dev/null
+++ b/src/common/utils/is-emptystring-or-nil.js
@@ -0,0 +1,10 @@
+import isEmptyString from './is-empty-string';
+import isNil from './is-nil';
+
+/**
+ * @param {*} value
+ * @returns {boolean}
+ */
+export default function isEmptyStringOrNil(value) {
+    return isEmptyString(value) || isNil(value);
+}
diff --git a/src/common/utils/omit-empty-and-nil.js b/src/common/utils/omit-empty-and-nil.js
deleted file mode 100644
index fdee85be..00000000
--- a/src/common/utils/omit-empty-and-nil.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import isEmptyOrNil from './is-empty-or-nil';
-import omitProperty from './omit-property';
-
-/**
- * @param {Object} object
- * @returns {Object}
- */
-export default function omitEmptyAndNil(object) {
-    return omitProperty(object, isEmptyOrNil);
-}
diff --git a/src/common/utils/omit-emptystring-and-nil.js b/src/common/utils/omit-emptystring-and-nil.js
new file mode 100644
index 00000000..25d9a676
--- /dev/null
+++ b/src/common/utils/omit-emptystring-and-nil.js
@@ -0,0 +1,10 @@
+import isEmptyStringOrNil from './is-emptystring-or-nil';
+import omitProperty from './omit-property';
+
+/**
+ * @param {Object} object
+ * @returns {Object}
+ */
+export default function omitEmptyStringAndNil(object) {
+    return omitProperty(object, isEmptyStringOrNil);
+}
diff --git a/src/payment/v1/payment-mappers/order-mapper.js b/src/payment/v1/payment-mappers/order-mapper.js
index 8c4ab48b..6b6ddedc 100644
--- a/src/payment/v1/payment-mappers/order-mapper.js
+++ b/src/payment/v1/payment-mappers/order-mapper.js
@@ -1,4 +1,4 @@
-import { omitEmptyAndNil, omitNil, toString } from '../../../common/utils';
+import { omitEmptyStringAndNil, omitNil, toString } from '../../../common/utils';
 
 export default class OrderMapper {
     /**
@@ -92,7 +92,7 @@ export default class OrderMapper {
     mapToAddress(data, addressKey) {
         const address = data[addressKey] || {};
 
-        return omitEmptyAndNil({
+        return omitEmptyStringAndNil({
             city: address.city,
             company: address.company,
             country_code: address.countryCode,