diff --git a/modules/services/maprules.js b/modules/services/maprules.js
index 8157639b9..7d3f6ffb5 100644
--- a/modules/services/maprules.js
+++ b/modules/services/maprules.js
@@ -164,10 +164,10 @@ export default {
         var _lineKeys = this._lineKeys;
         var _areaKeys = this._areaKeys;
 
-        var isAreaKeyBlackList = function(key) {
+        var keyValueDoesNotImplyArea = function(key) {
             return utilArrayIntersection(tagMap[key], Object.keys(_areaKeys[key])).length > 0;
         };
-        var isLineKeysWhiteList = function(key) {
+        var keyValueImpliesLine = function(key) {
             return utilArrayIntersection(tagMap[key], Object.keys(_lineKeys[key])).length > 0;
         };
 
@@ -181,10 +181,10 @@ export default {
         }
 
         for (var key in tagMap) {
-            if (key in _areaKeys && !isAreaKeyBlackList(key)) {
+            if (key in _areaKeys && !keyValueDoesNotImplyArea(key)) {
                 return 'area';
             }
-            if (key in _lineKeys && isLineKeysWhiteList(key)) {
+            if (key in _lineKeys && keyValueImpliesLine(key)) {
                 return 'area';
             }
         }
diff --git a/modules/svg/labels.js b/modules/svg/labels.js
index 3b37ef88a..60832d7cf 100644
--- a/modules/svg/labels.js
+++ b/modules/svg/labels.js
@@ -63,7 +63,7 @@ export function svgLabels(projection, context) {
     ];
 
 
-    function blacklisted(preset) {
+    function shouldSkipIcon(preset) {
         var noIcons = ['building', 'landuse', 'natural'];
         return noIcons.some(function(s) {
             return preset.id.indexOf(s) >= 0;
@@ -313,7 +313,7 @@ export function svgLabels(projection, context) {
 
             // Determine which entities are label-able
             var preset = geometry === 'area' && presetManager.match(entity, graph);
-            var icon = preset && !blacklisted(preset) && preset.icon;
+            var icon = preset && !shouldSkipIcon(preset) && preset.icon;
 
             if (!icon && !utilDisplayName(entity))
                 continue;