diff --git a/completition/xml/instruction.sublime-completions b/completition/xml/instruction.sublime-completions
index c68674f9..094af0b9 100644
--- a/completition/xml/instruction.sublime-completions
+++ b/completition/xml/instruction.sublime-completions
@@ -11,7 +11,7 @@
     // License for the specific language governing permissions and limitations under
     // the License.
 
-    "scope": "text.xml.1.0 - comment",
+    "scope": "text.xml - comment",
     "completions": [
         {
             "trigger": "cdata",
diff --git a/syntaxes/naomi.xml.sublime-syntax b/syntaxes/naomi.xml.sublime-syntax
index d0fac7cf..93d8c76d 100644
--- a/syntaxes/naomi.xml.sublime-syntax
+++ b/syntaxes/naomi.xml.sublime-syntax
@@ -28,7 +28,7 @@ file_extensions:
 
 first_line_match: <\?xml
 
-scope: text.xml.1.0
+scope: text.xml
 
 contexts:
   main:
diff --git a/syntaxes/xml/attribute.sublime-syntax b/syntaxes/xml/attribute.sublime-syntax
index d77aa80d..b63657d0 100644
--- a/syntaxes/xml/attribute.sublime-syntax
+++ b/syntaxes/xml/attribute.sublime-syntax
@@ -27,12 +27,12 @@ contexts:
     - match: |
         (?xi)
         {{commonIdentifier}}
-      scope: entity.name.attribute.xml.1.0
+      scope: entity.name.attribute.xml
       set: optional-value
 
   optional-value:
     - match: \=
-      scope: operator.assignment.xml.1.0
+      scope: operator.assignment.xml
       set: value
     - match: (?=\S)
       pop: true
diff --git a/syntaxes/xml/element/cdata.sublime-syntax b/syntaxes/xml/element/cdata.sublime-syntax
index 85414c2c..8e543f89 100644
--- a/syntaxes/xml/element/cdata.sublime-syntax
+++ b/syntaxes/xml/element/cdata.sublime-syntax
@@ -21,15 +21,15 @@ contexts:
   main:
     - match: (<!\[)(CDATA)(\[)
       captures:
-        0: tag.cdata.xml.1.0
-        1: punctuation.delimiter.tag.begin.xml.1.0
-        2: entity.name.tag.cdata.xml.1.0
-        3: punctuation.delimiter.tag.begin.xml.1.0
+        0: tag.cdata.xml
+        1: punctuation.delimiter.tag.begin.xml
+        2: entity.name.tag.cdata.xml
+        3: punctuation.delimiter.tag.begin.xml
       set: content
 
   content:
     - match: \]\]\>
       scope: >-
-        tag.cdata.xml.1.0
-        punctuation.delimiter.tag.end.xml.1.0
+        tag.cdata.xml
+        punctuation.delimiter.tag.end.xml
       pop: true
diff --git a/syntaxes/xml/element/comment.sublime-syntax b/syntaxes/xml/element/comment.sublime-syntax
index 7f3122b7..3017584d 100644
--- a/syntaxes/xml/element/comment.sublime-syntax
+++ b/syntaxes/xml/element/comment.sublime-syntax
@@ -20,12 +20,12 @@ scope: ...
 contexts:
   main:
     - match: <!--
-      scope: punctuation.comment.begin.xml.1.0
+      scope: punctuation.comment.begin.xml
       set: comment
 
   comment:
-    - meta_scope: comment.block.xml.1.0
-    - meta_content_scope: comment.content.xml.1.0
+    - meta_scope: comment.block.xml
+    - meta_content_scope: comment.content.xml
     - match: -->
-      scope: punctuation.comment.end.xml.1.0
+      scope: punctuation.comment.end.xml
       pop: true
diff --git a/syntaxes/xml/element/doctype.sublime-syntax b/syntaxes/xml/element/doctype.sublime-syntax
index 40236412..7a389330 100644
--- a/syntaxes/xml/element/doctype.sublime-syntax
+++ b/syntaxes/xml/element/doctype.sublime-syntax
@@ -21,8 +21,8 @@ contexts:
   main:
     - match: (<!)(DOCTYPE).*?(>)
       captures:
-        0: tag.doctype.xml.1.0
-        1: punctuation.delimiter.tag.begin.xml.1.0
-        2: entity.name.tag.doctype.xml.1.0
-        3: punctuation.delimiter.tag.end.xml.1.0
+        0: tag.doctype.xml
+        1: punctuation.delimiter.tag.begin.xml
+        2: entity.name.tag.doctype.xml
+        3: punctuation.delimiter.tag.end.xml
       pop: true
diff --git a/syntaxes/xml/element/normal.sublime-syntax b/syntaxes/xml/element/normal.sublime-syntax
index a489e69d..fa1d5070 100644
--- a/syntaxes/xml/element/normal.sublime-syntax
+++ b/syntaxes/xml/element/normal.sublime-syntax
@@ -31,9 +31,9 @@ contexts:
           {{commonIdentifier}}
         )
       scope: >-
-        element.xml.1.0
-        tag.open.xml.1.0
-        punctuation.delimiter.tag.begin.xml.1.0
+        element.xml
+        tag.open.xml
+        punctuation.delimiter.tag.begin.xml
       set: tag-name
 
   tag-name:
@@ -41,8 +41,8 @@ contexts:
         (?xi)
         ({{commonIdentifier}})
       scope: >-
-        tag.open.xml.1.0
-        entity.name.tag.xml.1.0
+        tag.open.xml
+        entity.name.tag.xml
       set: [
         content,
         attributes
@@ -53,26 +53,26 @@ contexts:
       pop: true
     - match: \>
       scope: >-
-        tag.open.xml.1.0
-        punctuation.delimiter.tag.end.xml.1.0
+        tag.open.xml
+        punctuation.delimiter.tag.end.xml
       pop: true
     - include: Packages/Naomi/syntaxes/xml/attribute.no-pop.sublime-syntax
 
   content:
-    - meta_scope: element.xml.1.0
-    - meta_content_scope: element.content.xml.1.0
+    - meta_scope: element.xml
+    - meta_content_scope: element.content.xml
     - match: />
       scope: >-
-        tag.open.void.xml.1.0
-        punctuation.delimiter.tag.end.xml.1.0aaaaaaaaaaaa
+        tag.open.void.xml
+        punctuation.delimiter.tag.end.xmlaaaaaaaaaaaa
       pop: true
     - match: |
         (?x)
         (</)(\1)(>)
       captures:
-        0: tag.close.xml.1.0
-        1: punctuation.delimiter.tag.begin.xml.1.0
-        2: entity.name.tag.xml.1.0
-        3: punctuation.delimiter.tag.end.xml.1.0
+        0: tag.close.xml
+        1: punctuation.delimiter.tag.begin.xml
+        2: entity.name.tag.xml
+        3: punctuation.delimiter.tag.end.xml
       pop: true
     - include: Packages/Naomi/syntaxes/xml/element.no-pop.sublime-syntax
diff --git a/syntaxes/xml/element/prolog.sublime-syntax b/syntaxes/xml/element/prolog.sublime-syntax
index 3fb565df..227fab01 100644
--- a/syntaxes/xml/element/prolog.sublime-syntax
+++ b/syntaxes/xml/element/prolog.sublime-syntax
@@ -21,30 +21,30 @@ contexts:
   main:
     - match: (<\?)(xml)
       captures:
-        0: tag.prolog.xml.1.0
-        1: punctuation.tag.instruction.begin.xml.1.0
-        2: entity.name.tag.instruction.prolog.xml.1.0
+        0: tag.prolog.xml
+        1: punctuation.tag.instruction.begin.xml
+        2: entity.name.tag.instruction.prolog.xml
       set: version
 
   terminator:
     - match: \s*\?>
       scope: >-
-        tag.prolog.xml.1.0
-        punctuation.tag.instruction.end.xml.1.0
+        tag.prolog.xml
+        punctuation.tag.instruction.end.xml
       pop: true
 
   assignment-operator:
     - match: \s*(=)
       captures:
-        1: operator.assignment.xml.1.0
+        1: operator.assignment.xml
       pop: true
 
   version:
     - include: terminator
     - match: version
       scope: >-
-        support.attribute.xml.1.0
-        entity.name.attribute.xml.1.0
+        support.attribute.xml
+        entity.name.attribute.xml
       set: [
         optional-attributes,
         version-value,
@@ -54,15 +54,15 @@ contexts:
   version-value:
     - match: (\")1.[0-9]+(\")
       captures:
-        0: string.quoted.double.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.double.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
     - match: (\')1.[0-9]+(\')
       captures:
-        0: string.quoted.single.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.single.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
 
   optional-attributes:
@@ -73,8 +73,8 @@ contexts:
     - include: terminator
     - match: encoding
       scope: >-
-        support.attribute.xml.1.0
-        entity.name.attribute.xml.1.0
+        support.attribute.xml
+        entity.name.attribute.xml
       set: [
         standalone,
         encoding-value,
@@ -86,25 +86,25 @@ contexts:
         (?xi)
         (\")[a-z][a-z0-9-._]+(\")
       captures:
-        0: string.quoted.double.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.double.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
     - match: |
         (?xi)
         (\')[a-z][a-z0-9-._]+(\')
       captures:
-        0: string.quoted.single.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.single.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
 
   standalone:
     - include: terminator
     - match: standalone
       scope: >-
-        support.attribute.xml.1.0
-        entity.name.attribute.xml.1.0
+        support.attribute.xml
+        entity.name.attribute.xml
       set: [
         terminator,
         standalone-value,
@@ -117,15 +117,15 @@ contexts:
         (?xi)
         (\")(?>yes|no)(\")
       captures:
-        0: string.quoted.double.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.double.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
     - match: |
         (?xi)
         (\')(?>yes|no)(\')
       captures:
-        0: string.quoted.single.xml.1.0
-        1: punctuation.delimiter.string.begin.xml.1.0
-        2: punctuation.delimiter.string.end.xml.1.0
+        0: string.quoted.single.xml
+        1: punctuation.delimiter.string.begin.xml
+        2: punctuation.delimiter.string.end.xml
       pop: true
diff --git a/syntaxes/xml/literal/string/double-quoted.sublime-syntax b/syntaxes/xml/literal/string/double-quoted.sublime-syntax
index 117cd969..de849016 100644
--- a/syntaxes/xml/literal/string/double-quoted.sublime-syntax
+++ b/syntaxes/xml/literal/string/double-quoted.sublime-syntax
@@ -20,11 +20,11 @@ scope: ...
 contexts:
   main:
     - match: \"
-      scope: punctuation.delimiter.string.begin.xml.1.0
+      scope: punctuation.delimiter.string.begin.xml
       set: string
 
   string:
-    - meta_scope: string.quoted.double.xml.1.0
+    - meta_scope: string.quoted.double.xml
     - match: \"
-      scope: punctuation.delimiter.string.end.xml.1.0
+      scope: punctuation.delimiter.string.end.xml
       pop: true
diff --git a/syntaxes/xml/literal/string/single-quoted.sublime-syntax b/syntaxes/xml/literal/string/single-quoted.sublime-syntax
index 938aa64d..b807752b 100644
--- a/syntaxes/xml/literal/string/single-quoted.sublime-syntax
+++ b/syntaxes/xml/literal/string/single-quoted.sublime-syntax
@@ -20,11 +20,11 @@ scope: ...
 contexts:
   main:
     - match: \'
-      scope: punctuation.delimiter.string.begin.xml.1.0
+      scope: punctuation.delimiter.string.begin.xml
       set: string
 
   string:
-    - meta_scope: string.quoted.single.xml.1.0
+    - meta_scope: string.quoted.single.xml
     - match: \'
-      scope: punctuation.delimiter.string.end.xml.1.0
+      scope: punctuation.delimiter.string.end.xml
       pop: true