diff --git a/template/drums.ly b/template/drums.ly
index eea27df..5e7065c 100644
--- a/template/drums.ly
+++ b/template/drums.ly
@@ -9,12 +9,12 @@
 
 \score {
 	\new StaffGroup <<
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\global
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
 			<<
 				\new NullVoice = "format" {
 					
@@ -24,16 +24,18 @@
 				}%End of side
 			>>
 		}
-		\new PipeBandDrumStaff = "tenor" {
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 		}
-		\new PipeBandDrumStaff = "bass" {
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass}
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 		}
 	>>
diff --git a/template/full.ly b/template/full.ly
index a5545ea..84500fa 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -13,11 +13,12 @@
 
 \score {
 	\new StaffGroup <<
-		\new Staff {
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				\new NullVoice = "format" {
 					
@@ -40,29 +41,33 @@
 %			\verseA
 %		  }
 %		}
-%		\new Staff = "seconds" {
+%		\new Staff = "seconds" \with {
+%			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
+%		} {
 %			\pipessecndglobal
-%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
 %
 %
 %		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 		}
 		\new PipeBandDrumStaff = "tenor" {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 		}
 		\new PipeBandDrumStaff = "bass" {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 		}
 	>>
diff --git a/template/mid.ly b/template/mid.ly
index 6ad5d11..006cce5 100644
--- a/template/mid.ly
+++ b/template/mid.ly
@@ -8,10 +8,11 @@
 
 \score {
 	\new StaffGroup <<
-		\new PipeBandDrumStaff = "tenor" {
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 			\global
 			<<
 				{
@@ -22,10 +23,11 @@
 				}%Music
 			>>
 		}
-		\new PipeBandDrumStaff = "bass" {
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 		}
 	>>
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index 9e6ea0f..307a02d 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -9,11 +9,12 @@
 
 \score {
 	\new StaffGroup <<
-		\new Staff = "pipes"  {
+		\new Staff = "pipes" \with{
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set Staff.instrumentName = \markup{ \instrumentPipes }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 			  	\new NullVoice = "format" {
 					
@@ -23,16 +24,18 @@
 				}%Pipes
 			>>
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
+		} {
 			\pipessecndglobal
-			\set Staff.instrumentName = \markup{ \instrumentSecnd }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
 			
 		}
-%		\new Staff = "thirds" {
+%		\new Staff = "thirds" \with {
+%			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
+%		} {
 %			\pipesthrdglobal
-%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentThrd }
-%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd }
 %
 %		}
 	>>
diff --git a/template/tenor.ly b/template/tenor.ly
index 36cc23a..c71a0f4 100644
--- a/template/tenor.ly
+++ b/template/tenor.ly
@@ -7,9 +7,9 @@
 
 \score {
     \new PipeBandDrumStaff {
-	\global
-	\tenorglobal
-	<<
+		\global
+		\tenorglobal
+		<<
 			\new NullVoice = "format" {
 			
 			}%Format
@@ -17,7 +17,7 @@
 			\new DrumVoice = "tenor" {
 			
 			}
-	>>
+		>>
 	}
 	\header {
 		title = \title