diff --git a/Java/JavaProperties.sublime-syntax b/Java/JavaProperties.sublime-syntax
index 848553ed41..599809028c 100644
--- a/Java/JavaProperties.sublime-syntax
+++ b/Java/JavaProperties.sublime-syntax
@@ -24,7 +24,7 @@ contexts:
     - include: escapes
     - match: \s*([:=])
       captures:
-        1: punctuation.separator.mapping.key-value.java-props
+        1: punctuation.separator.key-value.java-props
       set: maybe-property-value
     - match: \s+(?=\S)
       set: maybe-property-value
diff --git a/Java/tests/syntax_test_java_properties.properties b/Java/tests/syntax_test_java_properties.properties
index 29be1a85a8..f844be6ddc 100644
--- a/Java/tests/syntax_test_java_properties.properties
+++ b/Java/tests/syntax_test_java_properties.properties
@@ -22,7 +22,7 @@ property_name=Value of Property
 #             ^^^^^^^^^^^^^^^^^ meta.mapping.value.java-props
 #                              ^ - meta.mapping
 #^^^^^^^^^^^^ entity.name.key.java-props
-#            ^ punctuation.separator.mapping.key-value.java-props
+#            ^ punctuation.separator.key-value.java-props
 #             ^^^^^^^^^^^^^^^^^ string.unquoted.java-props
 #                              ^ - meta.mapping
 
@@ -33,7 +33,7 @@ property_name = Value of Property
 #                                ^ - meta.mapping
 #^^^^^^^^^^^^ entity.name.key.java-props
 #            ^ - entity.name.key.java-props
-#             ^ punctuation.separator.mapping.key-value.java-props
+#             ^ punctuation.separator.key-value.java-props
 #              ^ - entity.name.key.java-props
 #               ^^^^^^^^^^^^^^^^^ string.unquoted.java-props
 
@@ -43,7 +43,7 @@ property_name:Value of Property
 #             ^^^^^^^^^^^^^^^^^ meta.mapping.value.java-props
 #                              ^ - meta.mapping
 #^^^^^^^^^^^^ entity.name.key.java-props
-#            ^ punctuation.separator.mapping.key-value.java-props
+#            ^ punctuation.separator.key-value.java-props
 #             ^^^^^^^^^^^^^^^^^ string.unquoted.java-props
 
 property_name     :     Value of Property
@@ -53,7 +53,7 @@ property_name     :     Value of Property
 #                                        ^ - meta.mapping
 #^^^^^^^^^^^^ entity.name.key.java-props
 #            ^^^^^ - entity.name.key.java-props
-#                 ^ punctuation.separator.mapping.key-value.java-props
+#                 ^ punctuation.separator.key-value.java-props
 #                  ^^^^^ - entity.name.key.java-props
 #                       ^^^^^^^^^^^^^^^^^ string.unquoted.java-props
 
@@ -72,21 +72,21 @@ name=
 #   ^ meta.mapping.java-props
 #    ^ - meta.mapping
 #^^^ entity.name.key.java-props
-#   ^ punctuation.separator.mapping.key-value.java-props
+#   ^ punctuation.separator.key-value.java-props
 value
 #^^^^ meta.mapping.key.java-props
 #^^^^ entity.name.key.java-props - string
 
 =value
-# <- meta.mapping.java-props punctuation.separator.mapping.key-value.java-props
+# <- meta.mapping.java-props punctuation.separator.key-value.java-props
 #^^^^^ meta.mapping.value.java-props string.unquoted.java-props
 
 :value
-# <- meta.mapping.java-props punctuation.separator.mapping.key-value.java-props
+# <- meta.mapping.java-props punctuation.separator.key-value.java-props
 #^^^^^ meta.mapping.value.java-props string.unquoted.java-props
 
 name===value
-#   ^ punctuation.separator.mapping.key-value.java-props
+#   ^ punctuation.separator.key-value.java-props
 #    ^^ - punctuation.separator.mapping
 #    ^^^^^^^ string.unquoted.java-props
 
@@ -96,7 +96,7 @@ name\ with\=escap\es\:=Value \ with \nescap\es
 #         ^^ constant.character.escape.java-props
 #                ^^ constant.character.escape.java-props
 #                   ^^ constant.character.escape.java-props
-#                     ^ punctuation.separator.mapping.key-value.java-props
+#                     ^ punctuation.separator.key-value.java-props
 #                      ^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.java-props
 #                            ^^ constant.character.escape.java-props
 #                                   ^^ constant.character.escape.java-props