diff --git a/lib/util/keyutil.js b/lib/util/keyutil.js
index 29b9b05d..5c30d9cf 100644
--- a/lib/util/keyutil.js
+++ b/lib/util/keyutil.js
@@ -218,9 +218,9 @@ module.exports.parseKeyCharacterMap = function(stream) {
           return true
         }
         return fail(char, state)
-      case 'filter_value':
+      case 'filter_behavior_literal':
         if (char === '\\') {
-          state = 'filter_value_escape'
+          state = 'filter_behavior_literal_escape'
           return true
         }
         if (char !== "'") {
@@ -228,17 +228,17 @@ module.exports.parseKeyCharacterMap = function(stream) {
             type: 'literal'
           , value: char
           })
-          state = 'filter_value_end'
+          state = 'filter_behavior_literal_end'
           return true
         }
         return fail(char, state)
-      case 'filter_value_escape':
+      case 'filter_behavior_literal_escape':
         if (char === '\\' || char === '\'' || char === '"') {
           lastRule.behaviors.push({
             type: 'literal'
           , value: char
           })
-          state = 'filter_value_end'
+          state = 'filter_behavior_literal_end'
           return true
         }
         if (char === 'n') {
@@ -246,7 +246,7 @@ module.exports.parseKeyCharacterMap = function(stream) {
             type: 'literal'
           , value: '\n'
           })
-          state = 'filter_value_end'
+          state = 'filter_behavior_literal_end'
           return true
         }
         if (char === 't') {
@@ -254,15 +254,15 @@ module.exports.parseKeyCharacterMap = function(stream) {
             type: 'literal'
           , value: '\t'
           })
-          state = 'filter_value_end'
+          state = 'filter_behavior_literal_end'
           return true
         }
         if (char === 'u') {
-          state = 'filter_value_unicode_1'
+          state = 'filter_behavior_literal_unicode_1'
           return true
         }
         return fail(char, state)
-      case 'filter_value_end':
+      case 'filter_behavior_literal_end':
         if (char === '\'') {
           state = 'filter_behavior_start'
           return true
@@ -277,7 +277,7 @@ module.exports.parseKeyCharacterMap = function(stream) {
           return true
         }
         if (char === "'") {
-          state = 'filter_value'
+          state = 'filter_behavior_literal'
           return true
         }
         if (char === 'n') {
@@ -382,38 +382,38 @@ module.exports.parseKeyCharacterMap = function(stream) {
           return true
         }
         return fail(char, state)
-      case 'filter_value_unicode_1':
+      case 'filter_behavior_literal_unicode_1':
         if ((char >= '0' && char <= '9') ||
             (char >= 'a' && char <= 'f')) {
           lastRule.behaviors.push(lastBehavior = {
             type: 'literal'
           , value: parseInt(char, 16) << 12
           })
-          state = 'filter_value_unicode_2'
+          state = 'filter_behavior_literal_unicode_2'
           return true
         }
         return fail(char, state)
-      case 'filter_value_unicode_2':
+      case 'filter_behavior_literal_unicode_2':
         if ((char >= '0' && char <= '9') ||
             (char >= 'a' && char <= 'f')) {
           lastBehavior.value += parseInt(char, 16) << 8
-          state = 'filter_value_unicode_3'
+          state = 'filter_behavior_literal_unicode_3'
           return true
         }
         return fail(char, state)
-      case 'filter_value_unicode_3':
+      case 'filter_behavior_literal_unicode_3':
         if ((char >= '0' && char <= '9') ||
             (char >= 'a' && char <= 'f')) {
           lastBehavior.value += parseInt(char, 16) << 4
-          state = 'filter_value_unicode_4'
+          state = 'filter_behavior_literal_unicode_4'
           return true
         }
         return fail(char, state)
-      case 'filter_value_unicode_4':
+      case 'filter_behavior_literal_unicode_4':
         if ((char >= '0' && char <= '9') ||
             (char >= 'a' && char <= 'f')) {
           lastBehavior.value += parseInt(char, 16)
-          state = 'filter_value_end'
+          state = 'filter_behavior_literal_end'
           return true
         }
         return fail(char, state)