diff --git a/dist.ini b/dist.ini
index 99b952b..a0b72dc 100644
--- a/dist.ini
+++ b/dist.ini
@@ -12,6 +12,9 @@ Template     = 2.18
 [Prereqs / TestRequires ]
 Test::More   = 0
 
+[NextRelease]
+format = %-7v %{MMMM d, yyyy}d
+
 [@Git]
 tag_format = release/%v
 # push_to    = all
@@ -51,9 +54,6 @@ location = root
 
 [Manifest]
 
-[NextRelease]
-format = %-7v %{MMMM d, yyyy}d
-
 [MinimumPerl]
 
 [MetaJSON]
diff --git a/t/default_template2.t b/t/default_handler_as_engine.t
similarity index 100%
rename from t/default_template2.t
rename to t/default_handler_as_engine.t
diff --git a/t/default_template.t b/t/default_handler_as_plugin.t
similarity index 100%
rename from t/default_template.t
rename to t/default_handler_as_plugin.t
diff --git a/t/default_template3.t b/t/default_handler_no_templates_dir.t
similarity index 100%
rename from t/default_template3.t
rename to t/default_handler_no_templates_dir.t