diff --git a/bin/cli.js b/bin/cli.js
index cacb0f8..e6c23bb 100644
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -20,8 +20,8 @@ var cli = meow({
         '  --cookie             Adds a cookie on the main domain.',
         '  --auth-user          Basic HTTP authentication username.',
         '  --auth-pass          Basic HTTP authentication password.',
-        '  --block-domain       Disallow requests to given (comma-separated) domains - aka blacklist.',
-        '  --allow-domain       Only allow requests to given (comma-separated) domains - aka whitelist.',
+        '  --block-domain       Disallow requests to given (comma-separated) domains.',
+        '  --allow-domain       Only allow requests to given (comma-separated) domains.',
         '  --no-externals       Block all domains except the main one.',
         '  --reporter           The output format: "json" or "xml". Default is "json".',
         ''
diff --git a/front/src/js/services/apiService.js b/front/src/js/services/apiService.js
index 9162eca..01c6409 100644
--- a/front/src/js/services/apiService.js
+++ b/front/src/js/services/apiService.js
@@ -21,9 +21,9 @@ apiService.factory('API', ['$location', 'Runs', 'Results', function($location, R
             };
 
             
-            if (settings.domainsBlackOrWhite === 'black') {
+            if (settings.domainsBlockOrAllow === 'block') {
                 runObject.blockDomain = this.parseDomains(settings.domains);
-            } else if (settings.domainsBlackOrWhite === 'white') {
+            } else if (settings.domainsBlockOrAllow === 'allow') {
                 var allowedDomains = this.parseDomains(settings.domains);
                 if (allowedDomains.length > 0) {
                     runObject.allowDomain = allowedDomains;
diff --git a/front/src/views/index.html b/front/src/views/index.html
index 0eee70c..2bd2544 100644
--- a/front/src/views/index.html
+++ b/front/src/views/index.html
@@ -83,8 +83,8 @@
                 </div>
                 <div>
                     <div>
-                        <input type="radio" name="blackOrWhite" ng-model="settings.domainsBlackOrWhite" value="black" />blacklist
-                        <input type="radio" name="blackOrWhite" ng-model="settings.domainsBlackOrWhite" value="white" />whitelist
+                        <input type="radio" name="blockOrAllow" ng-model="settings.domainsBlockOrAllow" value="block" />block list
+                        <input type="radio" name="blockOrAllow" ng-model="settings.domainsBlockOrAllow" value="allow" />allow list
                     </div>
                     <textarea name="domains" ng-model="settings.domains" rows="5"></textarea>
                 </div>