diff --git a/grammars.yml b/grammars.yml
index 5b2d376c..4da6c0e2 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -26,9 +26,6 @@ vendor/grammars/Alloy.tmbundle:
 - source.alloy
 vendor/grammars/AutoHotkey/:
 - source.ahk
-vendor/grammars/st2-zonefile:
-- source.untitled
-- text.zone
 vendor/grammars/BrightScript.tmbundle/:
 - source.brightauthorproject
 - source.brightscript
@@ -473,6 +470,8 @@ vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
 vendor/grammars/sql.tmbundle:
 - source.sql
+vendor/grammars/st2-zonefile:
+- text.zone_file
 vendor/grammars/standard-ml.tmbundle:
 - source.cm
 - source.ml
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 71ffe7d8..99a8a19d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -750,6 +750,13 @@ DM:
   tm_scope: source.c++
   ace_mode: c_cpp
 
+DNS Zone:
+  type: data
+  extensions:
+  - .zone
+  tm_scope: text.zone_file
+  ace_mode: text
+
 DTrace:
   type: programming
   aliases:
@@ -790,13 +797,6 @@ Diff:
   tm_scope: source.diff
   ace_mode: diff
 
-DNS zone:
-  type: data
-  extensions:
-  - .zone
-  tm_scope: text.zone
-  ace_mode: text
-
 Dockerfile:
   type: data
   tm_scope: source.dockerfile
diff --git a/samples/zone/sneaky.net.zone b/samples/DNS Zone/sneaky.net.zone
similarity index 100%
rename from samples/zone/sneaky.net.zone
rename to samples/DNS Zone/sneaky.net.zone