diff --git a/libs/pbd/tests/TestSession.ardour b/libs/pbd/tests/TestSession.ardour
index d3bffd33a5..c58fca489a 100644
--- a/libs/pbd/tests/TestSession.ardour
+++ b/libs/pbd/tests/TestSession.ardour
@@ -26,7 +26,7 @@
     <Option name="save-history-depth" value="100"/>
     <Option name="history-depth" value="100"/>
     <Option name="default-narrow_ms" value="0"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources>
     <Source name="Guitar clean-1.wav" id="14361" captured-for="Guitar clean" flags="" channel="0"/>
diff --git a/templates/16 Tracks.template.in b/templates/16 Tracks.template.in
index e427d2b970..bb486ee7d8 100644
--- a/templates/16 Tracks.template.in	
+++ b/templates/16 Tracks.template.in	
@@ -24,7 +24,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="meter-hold" value="10"/>
     <Option name="meter-falloff" value="1.5"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources/>
   <Regions/>
diff --git a/templates/2 Track.template.in b/templates/2 Track.template.in
index c9f70455f7..39306afa6e 100644
--- a/templates/2 Track.template.in	
+++ b/templates/2 Track.template.in	
@@ -24,7 +24,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="meter-hold" value="10"/>
     <Option name="meter-falloff" value="1.5"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources/>
   <Regions/>
diff --git a/templates/32 Tracks.template.in b/templates/32 Tracks.template.in
index 8b95ef7629..5d7740bcd9 100644
--- a/templates/32 Tracks.template.in	
+++ b/templates/32 Tracks.template.in	
@@ -24,7 +24,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="meter-hold" value="10"/>
     <Option name="meter-falloff" value="1.5"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources/>
   <Regions/>
diff --git a/templates/4 Tracks.template.in b/templates/4 Tracks.template.in
index 41369d6b25..d85134e3b2 100644
--- a/templates/4 Tracks.template.in	
+++ b/templates/4 Tracks.template.in	
@@ -24,7 +24,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="meter-hold" value="10"/>
     <Option name="meter-falloff" value="1.5"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources/>
   <Regions/>
diff --git a/templates/8 Tracks.template.in b/templates/8 Tracks.template.in
index 1afe411390..7dc2b03834 100644
--- a/templates/8 Tracks.template.in	
+++ b/templates/8 Tracks.template.in	
@@ -24,7 +24,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="meter-hold" value="10"/>
     <Option name="meter-falloff" value="1.5"/>
-    <end-marker-is-free val="no"/>
+    <Option name="end-marker-is-free" value="0"/>
   </Config>
   <Sources/>
   <Regions/>