diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index 0c5b76d..66eda35 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -19,12 +19,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes }
 		} {
 			\global
+			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
 					% \line
 				}%Format
 				\new Voice = "pipes" {
-					\pipeglobal
 					\repeat unfold 4 { \pipesA | \break } % Remove me
 				}%Pipes
 			>>
diff --git a/template/pipes.ly b/template/pipes.ly
index ab0951c..eccc173 100644
--- a/template/pipes.ly
+++ b/template/pipes.ly
@@ -8,12 +8,12 @@
 \score {
     \new Staff {
 		\global
+		\pipeglobal
 		<<
 			\new NullVoice = "format" {
 				% \line
 			}%Format
 			\new Voice = "pipes" {
-				\pipeglobal
 				\repeat unfold 8 { \pipesA | \break } % Remove me
 			}%Pipes
 		>>
diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly
index c224b46..8f62aca 100644
--- a/template/pipes.seconds.ly
+++ b/template/pipes.seconds.ly
@@ -8,12 +8,12 @@
 \score {
     \new Staff {
 		\global
+		\pipessecndglobal
 		<<
 			\new NullVoice = "format" {
 				% \line	
 			}%Format
 			\new Voice = "seconds" {
-				\pipessecndglobal
 				\repeat unfold 8 { \pipessecndA | \break } % Remove me
 			}%Pipes
 		>>
diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly
index eb4a52e..f4171cd 100644
--- a/template/pipes.thirds.ly
+++ b/template/pipes.thirds.ly
@@ -8,12 +8,12 @@
 \score {
     \new Staff {
 		\global
+		\pipesthrdglobal
 		<<
 			\new NullVoice = "format" {
 				% \line
 			}%Format
 			\new Voice = "thirds" {
-				\pipesthrdglobal
 				\repeat unfold 8 { \pipesthrdA | \break } % Remove me
 			}%Pipes
 		>>