diff --git a/Library/TheNightPoorLarry.abc b/Library/NightPoorLarry.abc
similarity index 83%
rename from Library/TheNightPoorLarry.abc
rename to Library/NightPoorLarry.abc
index 2621f16..073e43c 100644
--- a/Library/TheNightPoorLarry.abc
+++ b/Library/NightPoorLarry.abc
@@ -1,5 +1,5 @@
 X: 1
-T: The Night Poor Larry Was Stretched
+T: Night Poor Larry Was Stretched, The
 R: slip jig
 M: 9/8
 L: 1/8
diff --git a/Session/BrightonCamp.abc b/Session/BrightonCamp.abc
index f68e9e1..7654251 100644
--- a/Session/BrightonCamp.abc
+++ b/Session/BrightonCamp.abc
@@ -1,6 +1,6 @@
 X:1
 T:Brighton Camp
-T:The girl I left behind me
+T:Girl I Left Behind Me, The
 O:England
 R:March
 Z:Transcribed by Bryan Creer
diff --git a/Session/SoldiersJoy.abc b/Session/SoldiersJoy.abc
index 35edb58..3723950 100644
--- a/Session/SoldiersJoy.abc
+++ b/Session/SoldiersJoy.abc
@@ -1,6 +1,6 @@
 X: 1
 T: Soldier's Joy
-T: The Forester
+T: Forester, The
 M: 4/4
 L: 1/8
 Q: 140
diff --git a/makeBookeTunePages.sh b/makeBookeTunePages.sh
index 61ca69e..feb63a7 100755
--- a/makeBookeTunePages.sh
+++ b/makeBookeTunePages.sh
@@ -42,6 +42,8 @@ find $booke -name "*.abc" | sort |
         fixtitle "$title"
         title=$retval
         subtitle=`$dir/abcfield.py --index 2 --field T --latex $filename`
+        fixtitle "$subtitle"
+        subtitle=$retval
         composer=`$dir/abcfield.py --field C --latex $filename`
 
         changefile=`$dir/abcfield.py --field N --contains "Change:" $filename | sed -e "s/Change: *//"`