diff --git a/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2 b/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2
new file mode 100644
index 0000000..0506a2a
--- /dev/null
+++ b/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2
@@ -0,0 +1,7 @@
+<html> <!-- vasl-templates:id {{SNIPPET_ID}} -->
+
+<!-- vasl-templates:name Count remaining -->
+<!-- vasl-templates:description Add the snippet as the label of a counter (e.g. Panzerfaust or Tank-Hunter Hero), then press <i>Ctrl-L</i> when you need to update how many are left. -->
+<!-- vasl-templates:comment The HTML is deliberately malformed, so that the number remaining is the last thing in snippet, which makes it easier to change during the course of a game. -->
+
+<div style="font-size:12px;font-weight:bold;"> {{COUNT:/3|Number}}
diff --git a/vasl_templates/webapp/data/default-template-pack/extras/pf-count.j2 b/vasl_templates/webapp/data/default-template-pack/extras/pf-count.j2
deleted file mode 100644
index b146f71..0000000
--- a/vasl_templates/webapp/data/default-template-pack/extras/pf-count.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-<html> <!-- vasl-templates:id {{SNIPPET_ID}} -->
-
-<!-- vasl-templates:name PF count -->
-<!-- vasl-templates:description Add the snippet as the label of a Panzerfaust counter, then press <i>Ctrl-L</i> when you need to update the number of remaining shots. -->
-<!-- vasl-templates:comment The HTML is deliberately malformed, so that the number of remaining shots is the last thing in snippet, which makes it easier to change during the course of a game. -->
-
-<div style="font-size:12px;font-weight:bold;"> {{PF_COUNT:/3|Number of PF shots}}
diff --git a/vasl_templates/webapp/data/default-template-pack/extras/thh-count.j2 b/vasl_templates/webapp/data/default-template-pack/extras/thh-count.j2
deleted file mode 100644
index 5260c2c..0000000
--- a/vasl_templates/webapp/data/default-template-pack/extras/thh-count.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-<html> <!-- vasl-templates:id {{SNIPPET_ID}} -->
-
-<!-- vasl-templates:name Tank-Hunter Hero count -->
-<!-- vasl-templates:description Add the snippet as the label of a Tank-Hunter Hero counter, then press <i>Ctrl-L</i> when you need to update how many are left. -->
-<!-- vasl-templates:comment The HTML is deliberately malformed, so that the number of remaining shots is the last thing in snippet, which makes it easier to change during the course of a game. -->
-
-<div style="font-size:12px;font-weight:bold;"> {{THH_COUNT:/3|Number of THH}}
