diff --git a/D/D.sublime-syntax b/D/D.sublime-syntax
index b2aac9cc42..8dce984bd1 100644
--- a/D/D.sublime-syntax
+++ b/D/D.sublime-syntax
@@ -1108,7 +1108,7 @@ contexts:
     - match: '\b({{name}})\s*(:)'
       captures:
         1: variable.other.d
-        2: punctuation.separator.mapping.key-value.d
+        2: punctuation.separator.key-value.d
       set: value
     - include: value-no-mapping-key
   value-no-mapping-key:
@@ -1518,7 +1518,7 @@ contexts:
       set: [value-array-list-after, value]
   value-array-list-after:
     - match: ':'
-      scope: punctuation.separator.mapping.key-value.d
+      scope: punctuation.separator.key-value.d
       set: [value-array-list-after-value, value]
     - include: value-array-list-after-value
   value-array-list-after-value:
diff --git a/D/tests/syntax_test_d.d b/D/tests/syntax_test_d.d
index 1abe2e943a..42a81a4e57 100644
--- a/D/tests/syntax_test_d.d
+++ b/D/tests/syntax_test_d.d
@@ -2352,7 +2352,7 @@ extern(1)
 //             ^ punctuation.section.brackets.begin.d
     1: 2,
   //^ meta.number.integer.decimal.d
-  // ^ punctuation.separator.mapping.key-value.d
+  // ^ punctuation.separator.key-value.d
   //   ^ meta.number.integer.decimal.d
   //    ^ punctuation.separator.sequence.d
     "foo",
@@ -3090,13 +3090,13 @@ extern(1)
 //           ^ meta.number.integer.decimal.d
 //            ^ punctuation.separator.sequence.d
 //              ^ variable.other.d
-//               ^ punctuation.separator.mapping.key-value.d
+//               ^ punctuation.separator.key-value.d
 //                 ^^^^ meta.string.d string.quoted.double.d
 //                     ^ punctuation.separator.sequence.d
     c: 5.sqrt(12) }.foo();
 //  ^^^^^^^^^^^^^^^ meta.block.d
 //  ^ variable.other.d
-//   ^ punctuation.separator.mapping.key-value.d
+//   ^ punctuation.separator.key-value.d
 //     ^ meta.number.integer.decimal.d
 //      ^ meta.path.d punctuation.accessor.dot.d
 //       ^^^^ meta.function-call.d meta.path.d variable.function.d