diff --git a/.Floppies/A2OSX.BOOTlc.po b/.Floppies/A2OSX.BOOTlc.po
index 33b425e5..159a388a 100644
Binary files a/.Floppies/A2OSX.BOOTlc.po and b/.Floppies/A2OSX.BOOTlc.po differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 7032536f..f5b96d4a 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/ProDOS.FX/ProDOS.S.XDOS.A.txt b/ProDOS.FX/ProDOS.S.XDOS.A.txt
index 358bf90e..f4f39c57 100644
--- a/ProDOS.FX/ProDOS.S.XDOS.A.txt
+++ b/ProDOS.FX/ProDOS.S.XDOS.A.txt
@@ -814,40 +814,17 @@ csvfkind 		ldx namptr			 	index to local name of pathname.
 				adc namptr			 	calc end of name
 				tax
 
-				.DO LOWERCASE=1
-				stz d_sosver
-				stz d_comp
-				.FIN
-				
 crname			lda pathbuf,x			move local name as filename
 				sta d_stor,y
 
-				.DO LOWERCASE=1
-				cmp #'a'
-				bcc .3
-				cmp #'z'+1
-				bcs .3
-
-				eor #$20
-				sta d_stor,y
-				
-				cpy #8
-				bcs .1
-
-				lda whichbit,y
-				tsb d_sosver
-				bra .2
-
-.1				lda whichbit-8,y
-				tsb d_comp
-				
-.2				lda #$80
-				tsb d_sosver
-.3				.FIN
 				dex
 				dey
 				bne crname
 
+				.DO LOWERCASE=1
+				jsr XDOS.LC2UCBM
+				.FIN
+
 				ldy #$03				index to 'access' parameter
 				lda (A3L),y
 				sta d_attr
@@ -907,21 +884,12 @@ cmvpass			lda pass,x				header info.
 				lda #$75
 				sta gbuf+20
 				
-				lda #$C3
-				sta gbuf+34
+				ldx #XDOS.VolHdrDef.Cnt-1
 				
-				lda #$27
-				sta gbuf+35
-				
-				lda #$0D
-				sta gbuf+36
-				
-*				ldx #XDOS.VolHdrDef.Cnt-1
-				
-*.1				lda XDOS.VolHdrDef,x
-*				sta gbuf+34,x
-*				dex
-*				bpl .1
+.1				lda XDOS.VolHdrDef,x
+				sta gbuf+34,x
+				dex
+				bpl .1
 				
 				.FIN
 
diff --git a/ProDOS.FX/ProDOS.S.XDOS.E.txt b/ProDOS.FX/ProDOS.S.XDOS.E.txt
index b9d3f5e2..93f4b449 100644
--- a/ProDOS.FX/ProDOS.S.XDOS.E.txt
+++ b/ProDOS.FX/ProDOS.S.XDOS.E.txt
@@ -688,19 +688,12 @@ L4AF0  			.DO LOWERCASE=1
 
 				jmp drevise1			end by updating all path directories.
 *--------------------------------------
-XDOS.UpdateHdr	ldx #$00
-
-				.DO LOWERCASE=0
-L4AF5  			sta gbuf+4,x
-				inx
-				iny
-				lda pathbuf,y
-				bne L4AF5
-				.ELSE
-
+XDOS.UpdateHdr	.DO LOWERCASE=1
 				stz gbuf+$20			VERSION
 				stz gbuf+$21			MIN VERSION
 
+				ldx #$00
+
 .1				sta gbuf+4,x
 			
 				inx
@@ -731,9 +724,21 @@ L4AF5  			sta gbuf+4,x
 				pla
 				eor #$20
 				bra .1
-
-				.FIN
+				
 .8				jmp wrtgbuf				write changed header block.
+
+				.ELSE
+
+				ldx #$00
+
+L4AF5  			sta gbuf+4,x
+				inx
+				iny
+				lda pathbuf,y
+				bne L4AF5
+
+				jmp wrtgbuf				write changed header block.
+				.FIN
 *--------------------------------------
 getnamptr 		ldy #$00				return pointer to 1st name of path.
 				bit prfxflg				is this a prefixed name ?
diff --git a/ProDOS.FX/ProDOS.S.XDOS.F.txt b/ProDOS.FX/ProDOS.S.XDOS.F.txt
index c5850734..99e25461 100644
--- a/ProDOS.FX/ProDOS.S.XDOS.F.txt
+++ b/ProDOS.FX/ProDOS.S.XDOS.F.txt
@@ -788,14 +788,14 @@ cmdtable 		.DA XDOS.Create
 				.DA XDOS.GetFileInfoEx
 
 dinctbl			.HS 0100000200			table to increment directory usage/eof counts
-				.DO LOWERCASE=0
+				.DO LOWERCASE=1
+XDOS.VolHdrDef	.HS C3270D
+XDOS.VolHdrDef.Cnt	.EQ *-XDOS.VolHdrDef
+				.ELSE
 pass			.HS 75
 xdosver			.HS 00
 compat			.HS 00
 				.HS C3270D000000
-				.ELSE
-*XDOS.VolHdrDef	.HS C3270D
-*XDOS.VolHdrDef.Cnt	.EQ *-XDOS.VolHdrDef
 				.FIN
 rootstuf 		.HS 0F02000400000800
 whichbit 		.HS 8040201008040201