diff --git a/make/bastokenizer-tools-bt-0.2.0.jar b/make/bastools-tools-bt-0.3.1.jar
similarity index 64%
rename from make/bastokenizer-tools-bt-0.2.0.jar
rename to make/bastools-tools-bt-0.3.1.jar
index 93aa68f..b64fe91 100644
Binary files a/make/bastokenizer-tools-bt-0.2.0.jar and b/make/bastools-tools-bt-0.3.1.jar differ
diff --git a/make/bt b/make/bt
index ca521ba..68421ea 100755
--- a/make/bt
+++ b/make/bt
@@ -27,7 +27,7 @@ shift
 
 tr -d '©' < "$INPUTFILE" > /tmp/bt_filtered.$$
 
-"$JAVA" -jar make/bastokenizer-tools-bt-0.2.0.jar $* /tmp/bt_filtered.$$
+"$JAVA" -jar make/bastools-tools-bt-0.3.0.jar $* /tmp/bt_filtered.$$
 RESULT=$?
 
 rm /tmp/bt_filtered.$$
diff --git a/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist
index c1165a2..3f8f548 100644
--- a/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II Basic Project.xctemplate/TemplateInfo.plist	
@@ -7,7 +7,7 @@
 		<string>___PACKAGENAME___.bas</string>
 		<string>Makefile</string>
 		<string>make/AppleCommander.jar</string>
-		<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+		<string>make/bastools-tools-bt-0.3.0.jar</string>
 		<string>make/createDiskImage</string>
 		<string>make/bt</string>
 		<string>make/DevApple.vii</string>
@@ -96,10 +96,10 @@
 			<key>Group</key>
 			<string>make</string>
 		</dict>
-		<key>make/bastokenizer-tools-bt-0.2.0.jar</key>
+		<key>make/bastools-tools-bt-0.3.0.jar</key>
 		<dict>
 			<key>Path</key>
-			<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+			<string>make/bastools-tools-bt-0.3.0.jar</string>
 			<key>Group</key>
 			<string>make</string>
 		</dict>
diff --git a/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist
index db0fdc0..412389d 100644
--- a/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II Merlin Project.xctemplate/TemplateInfo.plist	
@@ -8,7 +8,7 @@
 		<string>main.s</string>
 		<string>Makefile</string>
 		<string>make/AppleCommander.jar</string>
-		<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+		<string>make/bastools-tools-bt-0.3.0.jar</string>
 		<string>make/createDiskImage</string>
 		<string>make/bt</string>
 		<string>make/DevApple.vii</string>
@@ -110,10 +110,10 @@
 			<key>Group</key>
 			<string>make</string>
 		</dict>
-		<key>make/bastokenizer-tools-bt-0.2.0.jar</key>
+		<key>make/bastools-tools-bt-0.3.0.jar</key>
 		<dict>
 			<key>Path</key>
-			<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+			<string>make/bastools-tools-bt-0.3.0.jar</string>
 			<key>Group</key>
 			<string>make</string>
 		</dict>
diff --git a/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist
index 45b9fcf..ab7f8d4 100644
--- a/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II ca65 Project.xctemplate/TemplateInfo.plist	
@@ -7,7 +7,7 @@
 		<string>main.s</string>
 		<string>Makefile</string>
 		<string>make/AppleCommander.jar</string>
-		<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+		<string>make/bastools-tools-bt-0.3.0.jar</string>
 		<string>make/createDiskImage</string>
 		<string>make/bt</string>
 		<string>make/DevApple.vii</string>
@@ -96,10 +96,10 @@
 			<key>Group</key>
 			<string>make</string>
 		</dict>
-		<key>make/bastokenizer-tools-bt-0.2.0.jar</key>
+		<key>make/bastools-tools-bt-0.3.0.jar</key>
 		<dict>
 			<key>Path</key>
-			<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+			<string>make/bastools-tools-bt-0.3.0.jar</string>
 			<key>Group</key>
 			<string>make</string>
 		</dict>
diff --git a/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist
index 0c23601..4480d8e 100644
--- a/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II cc65 Project.xctemplate/TemplateInfo.plist	
@@ -7,7 +7,7 @@
 		<string>main.c</string>
 		<string>Makefile</string>
 		<string>make/AppleCommander.jar</string>
-		<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+		<string>make/bastools-tools-bt-0.3.0.jar</string>
 		<string>make/createDiskImage</string>
 		<string>make/bt</string>
 		<string>make/DevApple.vii</string>
@@ -96,10 +96,10 @@
 			<key>Group</key>
 			<string>make</string>
 		</dict>
-		<key>make/bastokenizer-tools-bt-0.2.0.jar</key>
+		<key>make/bastools-tools-bt-0.3.0.jar</key>
 		<dict>
 			<key>Path</key>
-			<string>make/bastokenizer-tools-bt-0.2.0.jar</string>
+			<string>make/bastools-tools-bt-0.3.0.jar</string>
 			<key>Group</key>
 			<string>make</string>
 		</dict>