diff --git a/.Docs/.HELLOWORLD.S.txt b/.Docs/.HELLOWORLD.S.txt
index df7cdac0..99501a89 100644
--- a/.Docs/.HELLOWORLD.S.txt
+++ b/.Docs/.HELLOWORLD.S.txt
@@ -54,7 +54,7 @@ CS.INIT			clc
 CS.RUN			
 * Put your code here
  			>LDYA L.MSG.HELLO
-			>SYSCALL puts
+			>SYSCALL PutS
 .8			lda #0			Exit Code = Succes 
 			sec			QUIT Process
 			rts
diff --git a/.Docs/.TEMPLATE.S.txt b/.Docs/.TEMPLATE.S.txt
index e8e9e195..fdb1fc58 100644
--- a/.Docs/.TEMPLATE.S.txt
+++ b/.Docs/.TEMPLATE.S.txt
@@ -54,7 +54,7 @@ CS.INIT			clc
 CS.RUN			
 * Put your code here
 * 				>LDYA L.MSG.Test		Load EFFECTIVE address
-*				>SYSCALL puts			Call API to print a string
+*				>SYSCALL PutS			Call API to print a string
 .8				lda #0					Exit Code = Succes 
 				sec						QUIT Process
 				rts
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 9a79354c..837853d1 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/AARP.S.txt b/BIN/AARP.S.txt
index c8d6cc41..9ce1fc34 100644
--- a/BIN/AARP.S.txt
+++ b/BIN/AARP.S.txt
@@ -57,7 +57,7 @@ CS.RUN			>LIBCALL hLIBETALK,LIBETALK.GETCFG
 
 *				jmp CS.RUN.ERR
 .1				ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				bcs .2
 				jmp CS.RUN.DUMP
@@ -71,7 +71,7 @@ CS.RUN			>LIBCALL hLIBETALK,LIBETALK.GETCFG
 				>SYSCALL sscanf
 				bcs CS.RUN.ERR
 				ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				beq CS.RUN.QUERY
 				cmp #3
@@ -80,7 +80,7 @@ CS.RUN			>LIBCALL hLIBETALK,LIBETALK.GETCFG
 
 CS.RUN.ERR		>PUSHBI 0
 				>LDYA L.MSG.Usage
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -113,7 +113,7 @@ CS.RUN.QUERY	jsr Init.Timeout
 				bne .4
 				>PUSHBI 8
 				>LDYA L.MSG2
-				>SYSCALL printf
+				>SYSCALL PrintF
 .8				lda #0
 .9				sec
 				rts
@@ -141,7 +141,7 @@ CS.RUN.ADD		>PUSHEA.G DST.MAC+5
 CS.RUN.DUMP		>LIBCALL hLIBETALK,LIBETALK.AARP.GETCACHE
 				>STYA ZPPTR1
 				>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #K.AARPCACHE.SIZE
 .1				lda (ZPPTR1)
@@ -166,7 +166,7 @@ CS.RUN.DUMP		>LIBCALL hLIBETALK,LIBETALK.AARP.GETCACHE
 				>PUSHBI 12
 				>LDYA L.MSG1
 				phx
-				>SYSCALL printf
+				>SYSCALL PrintF
 				plx
 .4				lda ZPPTR1
 				clc
diff --git a/BIN/ADT.S.txt b/BIN/ADT.S.txt
index bb333532..a9c16fb2 100644
--- a/BIN/ADT.S.txt
+++ b/BIN/ADT.S.txt
@@ -75,7 +75,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				lda (ZPIPCfgPtr)		Configured ?
 				bmi CS.RUN.IPOK
 				>LDYA L.MSG.IPKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -104,11 +104,11 @@ CS.RUN.IPOK		ldy #S.IPCFG.IP+3
 				>PUSHW ZPHostPtr
 				>PUSHBI 2
 				>LDYA L.MSG.UNKNOWN
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bra CS.RUN.ESYN
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 CS.RUN.ESYN		lda #E.SYN
 				secCS.RUN.RTS
@@ -159,7 +159,7 @@ CS.RUN.PORTOK	>PUSHW ZPHostPtr
 				bpl .1
 				>PUSHBI 8
 				>LDYA L.MSG.HOSTOK
-				>SYSCALL printf
+				>SYSCALL PrintF
 		
 CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				lda #S.SOCKET.T.DGRAM
@@ -173,7 +173,7 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				>LIBCALL hLIBTCPIP,LIBTCPIP.Bind
 				bcc .2
 .9				>LDYA L.MSG.SKTKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 c				rts
@@ -182,9 +182,9 @@ c				rts
 				>LIBCALL hLIBTCPIP,LIBTCPIP.Connect
 				bcs .9
 				>LDYA L.MSG.SKTOK
-				>SYSCALL puts
+				>SYSCALL PutS
 				>LDYAI RESP.BUFSIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPRespBufPtr
 				txa
@@ -203,7 +203,7 @@ CS.RUN.SKTERR	pha
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.SKTERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -212,7 +212,7 @@ CS.RUN.IOERR	pha
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.IOERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -275,7 +275,7 @@ CS.RUN.DIRDECODE
 				>PUSHW ZPPayloadLen
 				>PUSHW ZPPayloadPtr
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 				>INC.G bResponse
 				bra .1
@@ -291,7 +291,7 @@ CS.RUN.DIRDECODE
 				rts
 *--------------------------------------
 CS.RUN.UNRLE	>LDYA ZPPayloadLen
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPPayloadPtr
 				>STYA ZPPtr
diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt
index 31401953..c7bff74b 100644
--- a/BIN/ARP.S.txt
+++ b/BIN/ARP.S.txt
@@ -63,7 +63,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG
 
 				jmp CS.RUN.ERR
 .1				ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				bcs .2
 				jmp CS.RUN.DUMP
@@ -81,7 +81,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG
 				bcs CS.RUN.ERR
 
 				ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				beq CS.RUN.QUERY
 				cmp #3
@@ -90,7 +90,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG
 				
 CS.RUN.ERR		>PUSHW L.MSG.Usage
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -129,7 +129,7 @@ CS.RUN.QUERY	jsr Init.Timeout
 				bne .3
 
 				>PUSHBI 10
-				>SYSCALL printf
+				>SYSCALL PrintF
 .8				lda #0
 .9				sec
 				rts
@@ -158,7 +158,7 @@ CS.RUN.ADD		lda #2
 CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE
 				>STYA ZPPTR1
 				>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #K.ARPCACHE.SIZE
 				sta EntryCount
@@ -190,7 +190,7 @@ CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE
 				bne .2
 				
 				>PUSHBI 13
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .4				lda ZPPTR1
 				clc
diff --git a/BIN/ASM.S.DIR.txt b/BIN/ASM.S.DIR.txt
index 27cdffc8..31d5af15 100644
--- a/BIN/ASM.S.DIR.txt
+++ b/BIN/ASM.S.DIR.txt
@@ -337,7 +337,7 @@ DIR.HS			jsr SRC.GetNextCharNB
 				bcs .99
 				jsr SRC.IsDigit16
 				bcs .99
-.1				>STA.G DIR.Byte
+.1				sta DIR.Byte
 				jsr	SRC.GetNextChar
 				bcc .2
 
@@ -350,19 +350,19 @@ DIR.HS			jsr SRC.GetNextCharNB
 				cmp #'.'
 				bne .99
 
-.22				>LDA.G DIR.Byte
+.22				sta DIR.Byte
 				jsr OUT.EmitByte
 				bcc .5
 				rts
 .3				pha
-				>LDA.G DIR.Byte
+				sta DIR.Byte
 				asl
 				asl
 				asl
 				asl
-				>STA.G DIR.Byte
+				sta DIR.Byte
 				pla
-				>ORA.G DIR.Byte
+				ora DIR.Byte
 .4				jsr OUT.EmitByte
 				bcs .9
 				jsr	SRC.GetNextChar
@@ -605,7 +605,7 @@ DIR.TF			>LDA.G ASM.PASS			If Pass#1, ignore
 				
 				txa
 				>STA.G DST.hFILENAME
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>PUSHYA
 				>PUSHBI O.WRONLY+O.CREATE
 				>PUSHB ZPPtr2+1			Type
@@ -620,7 +620,7 @@ DIR.TF			>LDA.G ASM.PASS			If Pass#1, ignore
 .9				php
 				pha
 				lda ZPPtr2
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				pla
 				plp
 				
diff --git a/BIN/ASM.S.EXP.txt b/BIN/ASM.S.EXP.txt
index d9a712c2..9090e6e6 100644
--- a/BIN/ASM.S.EXP.txt
+++ b/BIN/ASM.S.EXP.txt
@@ -67,14 +67,7 @@ EXP.Eval.Next	stz SRC.ACC.F
 .14				cmp #'*'
 				bne .10
 
-				ldy #ASM.PC+3
-				ldx #3
-
-.11				lda (pData),y
-				sta SRC.ACC,x
-				dey
-				dex
-				bpl .11
+				jsr SYM.PC2Acc
 
 				jsr SRC.GetNextChar
 				jmp EXP.EvalOperator
diff --git a/BIN/ASM.S.FIO.txt b/BIN/ASM.S.FIO.txt
index d3e19a01..9806ead5 100644
--- a/BIN/ASM.S.FIO.txt
+++ b/BIN/ASM.S.FIO.txt
@@ -4,14 +4,14 @@ NEW
 FIO.Init.RTS	rts
 
 FIO.Init		>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs FIO.Init.RTS
 				>STYA ZPLineBuf
 				txa
 				>STA.G SRC.hLineBuf
 
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs FIO.Init.RTS
 				>STYA ZPTmpBuf
 				txa
@@ -146,15 +146,16 @@ FIO.OpenFile	>STYA ZPPtr1
 				bcs .99
 			
 				pha
-				>LDA.G SRC.Depth
+				>INC.G SRC.Depth
+				
 				clc
-				adc #SRC.hFILES
+				adc #SRC.hFILES-1
 				tay
 				pla
 				sta (pData),y
 				>LDA.G SRC.Depth
 				clc
-				adc #SRC.hFILETYPES
+				adc #SRC.hFILETYPES-1
 				tay
 
 				phy
@@ -163,8 +164,6 @@ FIO.OpenFile	>STYA ZPPtr1
 				ply
 				sta (pData),y
 
-				>INC.G SRC.Depth
-				
 				lda #0
 				>STA.G SRC.LINENUM
 				iny
@@ -304,7 +303,7 @@ FIO.FileClose	>LDA.G SRC.Depth
 				adc #SRC.hFILES-1
 				tay
 				lda (pData),y
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .8				clc
 				rts
diff --git a/BIN/ASM.S.MAC.txt b/BIN/ASM.S.MAC.txt
index be74a2a0..f864e0e9 100644
--- a/BIN/ASM.S.MAC.txt
+++ b/BIN/ASM.S.MAC.txt
@@ -7,14 +7,14 @@ MAC.Init		>SYSCALL SListNew
 				>STA.G MAC.hList
 				
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				
 				txa
 				>STA.G MAC.hBuf
 
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				
 				>STYA ZPMacroArgBuf
@@ -22,7 +22,7 @@ MAC.Init		>SYSCALL SListNew
 				>STA.G MAC.hArgBuf
 
 				>LDYAI MA.MAXDEPTH*6
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				
 				>STYA ZPMacroStk
@@ -435,7 +435,7 @@ MAC.Pop			>LDA.G MAC.StkPtr
 				
 				tay
 				lda (ZPMacroStk),y
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 				>LDA.G MAC.CtxStackPtr
 				clc
diff --git a/BIN/ASM.S.OUT.txt b/BIN/ASM.S.OUT.txt
index 1166dac3..22fdf782 100644
--- a/BIN/ASM.S.OUT.txt
+++ b/BIN/ASM.S.OUT.txt
@@ -62,15 +62,15 @@ OUT.PrintLineOn
 				rts
 *---------------------------------------
 OUT.PrintLineErr
-				>STA.G DIR.Byte			Save Error code
+				sta DIR.Byte			Save Error code
 
 				jsr OUT.PrintLine.1
 				bcs .9
 				
 .1				>PUSHW L.MSG.ERROR
-				>PUSHB.G DIR.Byte
+				>PUSHB DIR.Byte
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda ZPLinePtr
 				sec
@@ -137,7 +137,7 @@ OUT.PrintLine.1	jsr OUT.PrintLineOutBuf
 .2				>PUSHW L.MSG.LINENUM
 				>PUSHW.G SRC.LINENUM
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 	
 				>LDA.G MAC.CtxStackPtr
 				
@@ -151,11 +151,11 @@ OUT.PrintLine.1	jsr OUT.PrintLineOutBuf
 				bra .3
 
 .4				>LDYA ZPLineBuf
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				jmp OUT.PrintCR1
 *---------------------------------------
-OUT.Print		>SYSCALL printf
+OUT.Print		>SYSCALL PrintF
 				bcs OUT.Print.RTS
 				jmp OUT.PrintCR
 
@@ -196,7 +196,7 @@ OUT.PrintLineOutBuf
 .2				inc
 				inc
 				>PUSHA					Byte Count+2 for PC
-				>SYSCALL printf
+				>SYSCALL PrintF
 	
 				rts
 *---------------------------------------
@@ -221,7 +221,7 @@ OUT.PrintLineEQU
 				lda SRC.ACC.SIZE
 
 .2				>PUSHA					Byte Count
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *---------------------------------------
 OUT.EmitByte	phy
@@ -284,7 +284,7 @@ OUT.EmitByte	phy
 *---------------------------------------
 OUT.PrintCR		>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 OUT.PrintCR1	>DEC.G OUT.LineCnt
 				bne .8
diff --git a/BIN/ASM.S.SRC.txt b/BIN/ASM.S.SRC.txt
index a16a2501..751577a0 100644
--- a/BIN/ASM.S.SRC.txt
+++ b/BIN/ASM.S.SRC.txt
@@ -56,11 +56,9 @@ SRC.ParseLine.LABEL
 				beq SRC.ParseLine.InvLbl	illegal OUTSIDE macro
 
 .2				>LDA.G SYM.bInGlobal		Not relative to Global label...
-				bmi .3
-			>DEBUG
-				bra SRC.ParseLine.InvLbl
+				bpl SRC.ParseLine.InvLbl
 
-.3				jsr SRC.GetNextChar
+				jsr SRC.GetNextChar
 				bcs SRC.ParseLine.InvLbl
 
 				jsr SRC.GetDecimal
@@ -80,7 +78,7 @@ SRC.ParseLine.LABEL
 .8				jsr SYM.NewOrGetGlobal
 				bcs SRC.ParseLine.RTS
 *---------------------------------------
-SRC.ParseLine.DirOp	
+SRC.ParseLine.DirOp
 				jsr SRC.GetNextCharNB	Scan for an Opcode...
 				bcs SRC.ParseLine.Ok
 				cmp #'.'
@@ -101,6 +99,7 @@ SRC.ParseLine.DirOp
 				beq .1
 				cpx #30					.FIN?
 				bne SRC.ParseLine.Ok
+				
 .1				jmp (J.DIRECTIVES,x)
 
 .5				pha
@@ -126,9 +125,6 @@ SRC.ParseLine.InvDir
 				sec
 				rts
 *---------------------------------------
-SRC.ParseLine.DirJmp
-				jmp (J.DIRECTIVES,x)
-*---------------------------------------
 SRC.ParseLine.OpCode
 				>LDYA ZPOpsPtr
 				>STYA ZPOpDefPtr
@@ -261,38 +257,26 @@ SRC.ParseLine.AM
 .88				jmp SRC.ParseLine.Emit
 *---------------------------------------
 SRC.ParseLine.AMCheck
-*				ldx #5
-
-*.10			lda SRC.ACC.F,x
-*				>PUSHA
-*				dex
-*				bpl .10
-
-*				>PUSHBI 6
-*				>LDYA L.MSG.ACC
-*				>SYSCALL printf
-*				>LDYA L.SRC.AM.StrBuf
-*				jsr DEBUG.PSTR
 				>LDYA ZPAMPtr			Check if AM is valid for CPU
 				>STYA ZPPtr1
 				ldx #0
+
 .1				inx
-*				phx
-*				lda #'?'
-*				>SYSCALL putchar
-*				>LDYA ZPPtr1
-*				jsr DEBUG.PSTR
-*				plx
 				lda (ZPPtr1)
 				beq .9
+
 				cmp SRC.AM.StrBuf 
 				bne .7
+
 				tay
+
 .2				lda (ZPPtr1),y
 				cmp SRC.AM.StrBuf,y
 				bne .6
+
 				dey
 				bne .2
+
 				txa
 				>STA.G SRC.AMID
 
@@ -858,7 +842,7 @@ SRC.IsDigit8	cmp #'0'
 SRC.GetNextCharNB
 				jsr SRC.GetNextChar
 				bcs .9
-				cmp #' '
+				cmp #C.SPACE
 				beq SRC.GetNextCharNB
 				clc
 .9				rts
diff --git a/BIN/ASM.S.SYM.txt b/BIN/ASM.S.SYM.txt
index f1f2a0ff..bad81c6b 100644
--- a/BIN/ASM.S.SYM.txt
+++ b/BIN/ASM.S.SYM.txt
@@ -20,7 +20,7 @@ SYM.Init		>SYSCALL SListNew
 
 				>STA.G SYM.hList
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPSymbolBuf
 				txa
@@ -351,7 +351,7 @@ SYM.Dump		>LDA.G bListAll
 				bpl SYM.Dump.8
 				
 .10				>LDYA L.MSG.SYMBOLS
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				stz ZPPtr2
 				stz ZPPtr2+1
@@ -404,11 +404,11 @@ SYM.Dump		>LDA.G bListAll
 
 .3				>PUSHA
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW ZPTmpBuf			Label
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda (ZPSymbolBuf)
 
@@ -454,7 +454,7 @@ SYM.Dump.LP		ldy #SYMG
 				
 .5				>PUSHA
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				pla
 				clc
diff --git a/BIN/ASM.S.txt b/BIN/ASM.S.txt
index 6ecffee8..16487aca 100644
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@@ -230,13 +230,13 @@ CS.INIT			jsr CS.RUN.ARGS
 .99				pha
 				>PUSHW L.MSG.HELP
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 .9				rts
 *--------------------------------------
 CS.RUN.ARGS		ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				beq .90
 
 .1				inc ZPPtr1
@@ -291,7 +291,7 @@ CS.RUN.ARGS		ldy #S.PS.ARGC
 *--------------------------------------
 CS.RUN			ldy #S.PS.hStdIn
 				lda (pPS),y
-				>SYSCALL feof
+				>SYSCALL FEOF
 				bcs .99
 				tay
 				bne .13
@@ -381,7 +381,7 @@ CS.RUN			ldy #S.PS.hStdIn
 .1				jsr SYM.Dump
 
 				>LDYA L.MSG.END
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0					End of assembly, exit with no error
 				sec		
 				rts
@@ -411,7 +411,7 @@ CS.QUIT			jsr FIO.FileClose
 				>LDA.G DST.hREFNUM
 				beq .1
 				
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .1				jsr MAC.Quit
 
diff --git a/BIN/ATBROWSE.S.txt b/BIN/ATBROWSE.S.txt
index 6d5a6046..de725309 100644
--- a/BIN/ATBROWSE.S.txt
+++ b/BIN/ATBROWSE.S.txt
@@ -55,7 +55,7 @@ CS.RUN			>STZ.G P.GetInfo		Sync
 
 				pha
 				>LDYA L.MSG.NOATK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -64,7 +64,7 @@ CS.RUN.ATKOK	>LDA.G P.GetInfo+$E		NODE
 				>PUSHA
 				>PUSHW.G P.GetInfo+$8	NET
 				>LDYA L.MSG.NETNODE
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>STZ.G P.LookupName		Sync
 				lda #ATLookupName
@@ -77,7 +77,7 @@ CS.RUN.ATKOK	>LDA.G P.GetInfo+$E		NODE
 				>STA.G P.LookupName+$D	RetCnt
 				>LDYAI 1024
 				>STYA.G P.LookupName+$10	BufLen
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 
 				>STYA.G P.LookupName+$12	BufPtr
@@ -96,7 +96,7 @@ CS.RUN.ATKOK	>LDA.G P.GetInfo+$E		NODE
 				beq .8
 
 				>LDYA L.MSG.DUMP0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 .1				lda ZPPTR1
@@ -115,7 +115,7 @@ CS.RUN.ATKOK	>LDA.G P.GetInfo+$E		NODE
 				bpl .2
 
 				>LDYA L.MSG.DUMP
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				lda ZPPTR2
diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt
index beab4420..860d046b 100644
--- a/BIN/ATLOGON.S.txt
+++ b/BIN/ATLOGON.S.txt
@@ -45,7 +45,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 				bcc .10
 				pha
 				>LDYA L.MSG.NOATK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 .99				rts
diff --git a/BIN/BMP2PIX.S.txt b/BIN/BMP2PIX.S.txt
index 93754fd8..088cdf28 100644
--- a/BIN/BMP2PIX.S.txt
+++ b/BIN/BMP2PIX.S.txt
@@ -96,7 +96,7 @@ CS.RUN
 				bne .2
 .99				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -205,7 +205,7 @@ CS.RUN.1		lda #S.BM.F.BBP1
 *				bcs CS.RUN.RTS
 *				bra CS.RUN.1.LOOP
 *.8				>LDYA L.MSG.DONE
-*				>SYSCALL puts
+*				>SYSCALL PutS
 *				lda #0
 *				sec
 CS.RUN.RTS		rts
@@ -238,7 +238,7 @@ CS.RUN.24		lda #S.BM.F.BBP4
 .1				sta ZPInputRowBytes
 				stx ZPInputRowBytes+1
 				>LDYA ZPInputRowBytes
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.RUN.RTS
 				>STYA ZPInputBuf
 				txa
@@ -450,10 +450,10 @@ CS.RUN.OpenInput
 				>PUSHA
 				>PUSHBI 5
 				>LDYA L.MSG.HEADER.OK
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts
 .99				>LDYA L.MSG.HEADER.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.IBIN
 				sec
 				rts
@@ -502,7 +502,7 @@ CS.RUN.GetOutputBuf
 				sta ZPPtr1+1
 				bra .1
 .8				>LDYA ZPPtr1
-				>SYSCALL Getmem
+				>SYSCALL GetMem
 				bcs .9
 
 				>STYA ZPOutputBuf
@@ -547,11 +547,11 @@ CS.QUIT			>LDA.G hOutputBuf
 .2				>LDA.G hOutputFile
 				beq .3
 
-				>SYSCALL fclose
+				>SYSCALL FClose
 .3				>LDA.G hInputFile
 				beq .8
 
-				>SYSCALL fclose
+				>SYSCALL FClose
 .8				clc
 				rts
 *--------------------------------------
diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt
index 58a98285..045bc74d 100644
--- a/BIN/CAT.S.txt
+++ b/BIN/CAT.S.txt
@@ -82,7 +82,7 @@ CS.RUN
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .9				rts
@@ -194,7 +194,7 @@ CS.RUN.PRINT	inc LineNum
 				bra .20
 	
 .21				>LDYA ZPBufPtr
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 	
 .3				stz ByteIndex
@@ -226,14 +226,14 @@ CS.RUN.PRINT	inc LineNum
 .61				>PUSHW L.MSG.CTRLCHAR
 				>PUSHW ZPPtr1
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 .62				inc ByteIndex
 				bne .4
 				
 .7				>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .9				rts
 *--------------------------------------
@@ -244,7 +244,7 @@ CS.RUN.PRINTNUM	clc
 				>PUSHW L.MSG.LINENUM
 				>PUSHW LineNum
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 .8				rts
 *--------------------------------------
 CS.QUIT			lda hBuf
diff --git a/BIN/CHMOD.S.txt b/BIN/CHMOD.S.txt
index 465af60c..cd168511 100644
--- a/BIN/CHMOD.S.txt
+++ b/BIN/CHMOD.S.txt
@@ -75,7 +75,7 @@ CS.RUN			>INC.G ArgIndex
 
 .9				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .99				rts
@@ -105,7 +105,7 @@ CS.RUN			>INC.G ArgIndex
 				>LDA.G hSrcBasePath
 				beq .9
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPFullPath
 				txa
@@ -173,7 +173,7 @@ CS.RUN.DIR		>LDA.G bRecurse
 				>PUSHW L.MSG.DIR
 				>PUSHW ZPFullPath
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				>PUSHW ZPMode
@@ -195,7 +195,7 @@ CS.RUN.FILE		jsr FilterMatch
 				>PUSHW L.MSG.FILE
 				>PUSHW ZPFullPath
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				>PUSHW ZPMode
@@ -243,7 +243,7 @@ CS.RUN.Str2Mode	>SYSCALL ArgV
 *--------------------------------------
 CS.RUN.CheckErr	bcs .1
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 .1				pha
 				>PUSHW L.MSG.ERR
@@ -251,7 +251,7 @@ CS.RUN.CheckErr	bcs .1
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G bContinue
 				eor #$80
 				asl
diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt
index f1ccc787..82614cee 100644
--- a/BIN/CHTYP.S.txt
+++ b/BIN/CHTYP.S.txt
@@ -66,7 +66,7 @@ CS.INIT
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -98,7 +98,7 @@ CS.INIT
 				beq .99					we also have a TYPE
 				
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPFullPath
 				txa
@@ -159,7 +159,7 @@ CS.RUN.FILE		jsr CS.RUN.GetFilePath
 				>PUSHW L.MSG.FILE
 				>PUSHW ZPFullPath
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				ldy #HexFileType
@@ -182,7 +182,7 @@ CS.RUN.FILE		jsr CS.RUN.GetFilePath
 *--------------------------------------
 CS.RUN.CheckErr	bcs .1
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 .1				pha
 				>PUSHW L.MSG.ERR
@@ -190,7 +190,7 @@ CS.RUN.CheckErr	bcs .1
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G bContinue
 				eor #$80
 				asl
diff --git a/BIN/CMP.S.txt b/BIN/CMP.S.txt
index 1cde0642..3bb435a4 100644
--- a/BIN/CMP.S.txt
+++ b/BIN/CMP.S.txt
@@ -78,7 +78,7 @@ CS.RUN
 				
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .9				rts
@@ -251,7 +251,7 @@ CS.RUN.Print	phy
 				>PUSHB (ZPBufPtr1),y
 				>PUSHB (ZPBufPtr2),y
 				>PUSHBI 5
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				ply
 				rts
diff --git a/BIN/CSH.S.CORE.txt b/BIN/CSH.S.CORE.txt
index 224db4c8..849ed274 100644
--- a/BIN/CSH.S.CORE.txt
+++ b/BIN/CSH.S.CORE.txt
@@ -500,7 +500,7 @@ CSH.fCall		ldx ZPPtr1
 				sta ZPPtr2				save Type
 				stz ZPPtr2+1			Reset VARIADIC byte count
 				>LDYA L.CSH.FN
-				jsr CSH.LookupFn
+				jsr CSH.LookupFN
 				phx						X = function index
 				bcs .10
 
@@ -1048,7 +1048,7 @@ CSH.GetDefine	>PUSHB.G CSH.hDefines
 				sta ZPFileBufPtrBak+1
 				
 				txa
-				>SYSCALL getmemptr
+				>SYSCALL GetMemPtr
 				>STYA ZPFileBufPtr
 
 .9				rts				
@@ -1336,7 +1336,7 @@ CSH.GetChar		lda (ZPFileBufPtr)
 				
 				phx
 				phy
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				ply
 				plx
 
@@ -1411,7 +1411,7 @@ CSH.GetVarSize	txa
 .2				lda #2
 				rts
 *--------------------------------------
-DEBUG.VAR		>SYSCALL putchar
+DEBUG.VAR		>SYSCALL PutChar
 				>PUSHW L.MSG.DBGVAR
 				>PUSHW ZPVarID
 				>PUSHW ZPVarType
@@ -1422,7 +1422,7 @@ DEBUG.VAR		>SYSCALL putchar
 				dey
 				bpl .1
 				>PUSHBI 12
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 MAN
diff --git a/BIN/CSH.S.EXEC.txt b/BIN/CSH.S.EXEC.txt
index 00e46f3a..c7bee2b0 100644
--- a/BIN/CSH.S.EXEC.txt
+++ b/BIN/CSH.S.EXEC.txt
@@ -233,36 +233,36 @@ EXEC.atan		>FPU ATAN
 				clc
 				rts
 *--------------------------------------
-EXEC.getchar	>SYSCALL getchar
+EXEC.getchar	>SYSCALL GetChar
 				>PUSHA
 				rts
 *--------------------------------------
 EXEC.puts		>PULLYA
-				>SYSCALL puts
+				>SYSCALL PutS
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.printf		>SYSCALL printf
+EXEC.printf		>SYSCALL PrintF
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.execl		>SYSCALL execl
+EXEC.execl		>SYSCALL ExecL
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.putenv		>SYSCALL putenv
+EXEC.putenv		>SYSCALL PutEnv
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.setenv		>SYSCALL setenv
+EXEC.setenv		>SYSCALL SetEnv
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.getenv		>SYSCALL getenv
+EXEC.getenv		>SYSCALL GetEnv
 				>PUSHYA
 				rts
 *--------------------------------------
-EXEC.unsetenv	>SYSCALL unsetenv
+EXEC.unsetenv	>SYSCALL UnsetEnv
 				>PUSHYA
 				rts
 *--------------------------------------
@@ -270,7 +270,7 @@ EXEC.MD5		>SYSCALL MD5
 				rts
 *--------------------------------------
 EXEC.malloc		>PULLYA
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				>PUSHYA
 				rts
 *--------------------------------------
diff --git a/BIN/CSH.S.txt b/BIN/CSH.S.txt
index 890ac59d..e6b94277 100644
--- a/BIN/CSH.S.txt
+++ b/BIN/CSH.S.txt
@@ -86,7 +86,7 @@ CS.RUN			>PUSHW L.MSG.GREETINGS
 				>PUSHB #K.VER
 				>PUSHB /K.VER
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs CS.INIT.RTS
 
 				jsr CS.RUN.ARGS
@@ -123,7 +123,7 @@ CS.RUN			>PUSHW L.MSG.GREETINGS
 CS.RUN.ARGS		inc ArgIndex	
 
 				lda ArgIndex
-				>SYSCALL ARGV
+				>SYSCALL ArgV
 				bcs .7
 		
 				>STYA ZPPtr1
@@ -174,7 +174,7 @@ CS.RUN.ARGS		inc ArgIndex
 
 .90				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda #E.SYN
 				sec						QUIT Process
@@ -235,7 +235,7 @@ PrintErrMsg		lda ZPhMacro
 .6				>PUSHBI '-'
 				ldy #S.PS.hStdErr
 				lda (pPS),y
-				>SYSCALL fputc
+				>SYSCALL FPutC
 				inc ZPPtr3
 				bne .5
 				inc ZPPtr3+1
@@ -247,7 +247,7 @@ PrintErrMsg		lda ZPhMacro
 				>PUSHW L.MSG.ERR
 				>PUSHW ZPPtr2		Line counter
 				>PUSHBI 2
-				>SYSCALL fprintf
+				>SYSCALL FPrintF
 
 				rts
 *--------------------------------------
@@ -258,7 +258,7 @@ PrintDebugMsg	>LDYA pStack
 				>PUSHW ZPPtr2
 				
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 PrintTraceMsg	>STYA ZPPtr3
@@ -266,7 +266,7 @@ PrintTraceMsg	>STYA ZPPtr3
 PrintTraceMsg.3	>PUSHBI '>'
 				ldy #S.PS.hStdErr
 				lda (pPS),y
-				>SYSCALL fputc
+				>SYSCALL FPutC
 				
 				ldy #$ff
 
@@ -281,7 +281,7 @@ PrintTraceMsg.3	>PUSHBI '>'
 				>PUSHA
 				ldy #S.PS.hStdErr
 				lda (pPS),y
-				>SYSCALL fputc
+				>SYSCALL FPutC
 				ply
 				bra .1
 				
@@ -291,7 +291,7 @@ PrintTraceMsg.3	>PUSHBI '>'
 				
 				>PUSHW L.MSG.ECHOCRLF
 				>PUSHBI 0
-				>SYSCALL fprintf
+				>SYSCALL FPrintF
 
 				rts
 *--------------------------------------
@@ -302,7 +302,7 @@ CS.END
 *--------------------------------------
 * Initialized DATA
 *--------------------------------------
-MSG.Greetings	.AZ "\r\nCSH-Shell %d.%d\r\n\r\n"
+MSG.GREETINGS	.AZ "\r\nCSH-Shell %d.%d\r\n\r\n"
 MSG.USAGE		.AS "Usage : CSH <option> file\r\n"
 				.AS "   -D : Debug Mode\r\n"
 				.AS "   -T : Trace On"
diff --git a/BIN/CUT.S.txt b/BIN/CUT.S.txt
index 381be474..9b674829 100644
--- a/BIN/CUT.S.txt
+++ b/BIN/CUT.S.txt
@@ -110,7 +110,7 @@ CS.RUN			lda #C.SPACE
 .98				pha
 				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 .9				rts
@@ -208,13 +208,13 @@ CS.RUN.OUT		ldx FieldNum
 				sta (ZPBufPtr),y
 
 .8				>LDYA ZPBufPtr
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				rts
 *--------------------------------------
 CS.RUN.PRINTCR	>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				rts
 *--------------------------------------
@@ -253,7 +253,7 @@ CS.RUN.OUT.MN	ldy #0
 				jsr CS.RUN.AddYToBufPtr
 
 .80				>LDYA ZPBufPtr
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				rts
 *--------------------------------------
@@ -277,7 +277,7 @@ CS.RUN.AddYToBufPtr
 CS.QUIT			lda hToClose
 				beq .1
 
-				>SYSCALL fclose			Close the pipe
+				>SYSCALL FClose			Close the pipe
 				
 .1				lda hBuf
 				beq .8
diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt
index a72c52c9..5d0c9969 100644
--- a/BIN/DNSINFO.S.txt
+++ b/BIN/DNSINFO.S.txt
@@ -61,13 +61,13 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				bmi CS.RUN.IPOK
 
 				>LDYA L.MSG.IPKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec				
 				rts
 
 CS.RUN.IPOK		ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				bne .1
 
 				jmp CS.RUN.DUMP
@@ -77,7 +77,7 @@ CS.RUN.IPOK		ldy #S.PS.ARGC
 
 				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda #E.SYN
 				sec
@@ -115,7 +115,7 @@ CS.RUN.ADD		lda #2
 CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache
 				>STYA ZPPTR1
 				>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #K.DNSCACHE.SIZE
 				sta EntryCount
@@ -160,7 +160,7 @@ CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache
 				bne .2
 
 				>PUSHBI 14
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .6				lda ZPPTR1
 				clc
diff --git a/BIN/EDIT.S.BUF.txt b/BIN/EDIT.S.BUF.txt
index 07e04c9f..737cbc3a 100644
--- a/BIN/EDIT.S.BUF.txt
+++ b/BIN/EDIT.S.BUF.txt
@@ -17,7 +17,7 @@ BUF.InsertA		sta TmpByte
 .2				lda TmpByte
 				sta (BufPtr)
 
-				jmp SCRN.Unsaved
+				jmp SCRN.UnSaved
 
 .8				clc	
 .9				rts
@@ -51,7 +51,7 @@ BUF.InsertTAB	>LDA.G FileX
 				dey
 				bpl .2
 
-				jmp SCRN.Unsaved
+				jmp SCRN.UnSaved
 
 .8				stz TmpByte
 				clc	
@@ -99,18 +99,18 @@ BUF.InsertClipboard
 
 				jsr BUF.ComputeCOffset
 
-				>LDYA.G ClipboardLen 
+				>LDYA.G ClipBoardLen 
 				jsr BUF.BufPtrSetup
 				bcs .9
 
 				jsr BUF.MoveForwardTail
 				
-				>LDA.G ClipboardLen
+				>LDA.G ClipBoardLen
 				eor #$ff
 				tax
 				
 				iny
-				lda (pData),y			ClipboardLen+1
+				lda (pData),y			ClipBoardLen+1
 				eor #$ff
 				pha
 				
@@ -135,7 +135,7 @@ BUF.InsertClipboard
 				
 .3				jsr BUF.ResetSel
 				jsr SCRN.UpdateStatusBar
-				jmp SCRN.Unsaved
+				jmp SCRN.UnSaved
 				
 .8				clc	
 .9				rts
@@ -237,7 +237,7 @@ BUF.SelToClipboard
 .9				rts
 *--------------------------------------
 BUF.CopyClipboard
-				>LDA.G ClipboardLen
+				>LDA.G ClipBoardLen
 				eor #$ff
 				tax
 				iny
@@ -566,7 +566,7 @@ BUF.BufPtr.Realloc
 				>PUSHA
 				>PUSHBI 0
 				
-				>SYSCALL realloc
+				>SYSCALL Realloc
 				bcs .9
 
 				>STYA.G BufBase
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index b783be1d..f63faad7 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -64,7 +64,7 @@ Ctrl.A			>STZ.G bUpdateStatus
 				>PUSHW L.MSG.HELPLINE
 				>PUSHW ZPPTR1
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				inc TmpByte
@@ -551,7 +551,7 @@ Ctrl.FS			jsr BUF.GetLine
 *--------------------------------------
 Ctrl.V			jsr BUF.InsertClipboard
 				bcs .9
-				jsr SCRN.Unsaved
+				jsr SCRN.UnSaved
 				jmp SCRN.UpdateMainAndStatus
 
 .9				rts
@@ -591,7 +591,7 @@ Ctrl.D			jsr BUF.DelSel
 				bcs Ctrl.D.8
 				jsr BUF.ResetSel
 				jsr SCRN.CursorAdjust
-				jsr SCRN.Unsaved		will update TopBar
+				jsr SCRN.UnSaved		will update TopBar
 				jmp SCRN.UpdateMainAndStatus
 				
 Ctrl.D.8		clc
@@ -630,7 +630,7 @@ Ctrl.Z			jsr BUF.ComputeCOffset
 				dec
 				>PUSHA
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				jsr SCRN.ResetScrollRgn
@@ -645,7 +645,7 @@ Ctrl.Z			jsr BUF.ComputeCOffset
 .8				jsr SCRN.UpdateCurrentLine
 				bcs .9
 
-.80				jsr SCRN.Unsaved
+.80				jsr SCRN.UnSaved
 				jsr SCRN.GotoCurXCurY
 				jmp SCRN.UpdateStatusBar
 .9				rts				
diff --git a/BIN/EDIT.S.DLG.txt b/BIN/EDIT.S.DLG.txt
index a45ba97c..57fc8ce0 100644
--- a/BIN/EDIT.S.DLG.txt
+++ b/BIN/EDIT.S.DLG.txt
@@ -6,7 +6,7 @@ DLG.Open		>STYA ZPPTR2
 				lda (ZPPTR2)
 				tay
 				lda #0
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				
 				>STYA ZPPTR1
@@ -189,7 +189,7 @@ DLG.Close		ldy #S.DLG.Y
 				bcs .9
 
 				>LDA.G hDLG
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 				>STZ.G hDLG
 				clc
@@ -250,7 +250,7 @@ DLG.CTRL.Draw.TB
 				tay
 				lda (pData),y
 
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPPTR2
 	
 				lda #C.SPACE
@@ -718,7 +718,7 @@ DLG.CTRL.CharIn.TB
 				lda (ZPPTR1),y			hMem
 				tay
 				lda (pData),y
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPPTR2
 
 				ply
@@ -752,7 +752,7 @@ DLG.CTRL.CharIn.TB
 				lda (ZPPTR1),y			hMem
 				tay
 				lda (pData),y
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPPTR2
 
 				ply
diff --git a/BIN/EDIT.S.FILE.txt b/BIN/EDIT.S.FILE.txt
index 0ac79270..9d726bb1 100644
--- a/BIN/EDIT.S.FILE.txt
+++ b/BIN/EDIT.S.FILE.txt
@@ -76,7 +76,7 @@ FILE.Load		jsr BUF.ResetSel
 .8				php
 				pha
 				lda TmpByte
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				pla
 				plp
 				
@@ -386,12 +386,12 @@ FILE.Close		php
 				pha
 				lda TmpByte
 				beq .1
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 .1				lda TmpIndex
 				beq .2
 				
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .2				pla
 				plp
diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt
index 656fd44c..b298905d 100644
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@@ -7,7 +7,7 @@ SCRN.Init		>PUSHW L.SEQ.INIT
 				dec
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs SCRN.Init.9
 
 				jsr SCRN.Home
@@ -43,7 +43,7 @@ SCRN.ResetScrollRgn
 				dec
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 SCRN.UnSaved	>LDA.G bUnSaved
@@ -263,7 +263,7 @@ SCRN.UpdateMain.1
 
 				>PUSHW L.SEQ.CEOL
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs SCRN.UpdateMain.9
 
 				inc TmpByte
@@ -500,12 +500,12 @@ SCRN.GotoXY		>PUSHW L.MSG.GOTOXY
 				>PUSHA
 				>PUSHBI 2
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 SCRN.scrollUp	>PUSHW L.SEQ.SCROLLUP
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				>LDA.G ScreenY+1
@@ -531,7 +531,7 @@ SCRN.scrollUp	>PUSHW L.SEQ.SCROLLUP
 *--------------------------------------
 SCRN.scrollDn	>PUSHW L.SEQ.SCROLLDN
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				>LDA.G ScreenY+1
@@ -622,7 +622,7 @@ SCRN.LineBufOut	lda #0
 
 				>PUSHW.G LineBufBase
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 MAN
diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt
index 0423f1ca..72d38d2c 100644
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@@ -145,7 +145,7 @@ CS.INIT.RTS		rts
 *--------------------------------------
 CS.RUN			>PUSHW L.MSG.DETECT
 				>PUSHBI 0
-				>SYSCALL printf		Send Query for term W & H
+				>SYSCALL PrintF		Send Query for term W & H
 				bcs CS.INIT.RTS
 
 .1				>SYSCALL GetChar
@@ -156,7 +156,7 @@ CS.RUN			>PUSHW L.MSG.DETECT
 				beq .1
 
 				>LDYAI 510+5+5+4+1		potentially 255*\\ NORM,INV,CEOL & \0
-				>SYSCALL Getmem
+				>SYSCALL GetMem
 				bcs CS.INIT.RTS
 				>STYA.G LineBufBase
 				txa
@@ -185,7 +185,7 @@ CS.RUN			>PUSHW L.MSG.DETECT
 				bcs CS.RUN.RTS
 				
 				>LDYAI 65
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.RUN.RTS
 				>STYA ZPPTR1
 				txa
@@ -195,7 +195,7 @@ CS.RUN			>PUSHW L.MSG.DETECT
 				sta (ZPPTR1)
 				
 				>LDYAI 65
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.RUN.RTS
 				>STYA ZPPTR1
 				txa
@@ -218,7 +218,7 @@ CS.RUN.LOOP		jsr GetCh
 .9				pha
 				>PUSHW L.SEQ.RESET
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 CS.RUN.RTS		rts
@@ -264,7 +264,7 @@ CS.QUIT			ldy #hLineBuf
 CS.QUIT.CLCRTS	clc
 				rts
 *--------------------------------------
-GetCh			>SYSCALL getchar
+GetCh			>SYSCALL GetChar
 				bcs .9
 				
 				cmp #C.CR
@@ -272,7 +272,7 @@ GetCh			>SYSCALL getchar
 				
 				ldy #S.PS.hStdIn		Check for any extra LF
 				lda (pPS),y
-				>SYSCALL feof
+				>SYSCALL FEOF
 				bcs .9
 				
 				tay
diff --git a/BIN/ETCONFIG.S.txt b/BIN/ETCONFIG.S.txt
index 542b7e36..d959495f 100644
--- a/BIN/ETCONFIG.S.txt
+++ b/BIN/ETCONFIG.S.txt
@@ -101,7 +101,7 @@ CS.RUN			>LIBCALL hLIBETALK,LIBETALK.GETCFG
 				lda ETKCFG+S.NETCFG.DevID
 				bne CS.RUN.SETUP
 				>LDYA L.MSG.NODEV
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #MLI.E.NODEV
 				sec
 				rts
@@ -148,7 +148,7 @@ CS.RUN.DUMPNIC	ldy #DCB.NIC+S.DCB.NIC.MAC+5
 				>PUSHA
 				>PUSHBI 11
 				>LDYA L.MSG1.DEV
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G DCB.NIC+S.DCB.NIC.FLAGS
 				and #S.DCB.NIC.FLAGS.ARPOFFLOAD
 				beq .2
@@ -156,7 +156,7 @@ CS.RUN.DUMPNIC	ldy #DCB.NIC+S.DCB.NIC.MAC+5
 .2				>PUSHA
 				>PUSHBI 1	
 				>LDYA L.MSG1.DEV.ARP
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G DCB.NIC+S.DCB.NIC.FLAGS
 				and #S.DCB.NIC.FLAGS.IPOFFLOAD
 
@@ -167,19 +167,19 @@ CS.RUN.DUMPNIC	ldy #DCB.NIC+S.DCB.NIC.MAC+5
 				>PUSHA		
 				>PUSHBI 1	
 				>LDYA L.MSG1.DEV.IP
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDA.G DCB.NIC+S.DCB.NIC.LINK
 				and #S.DCB.NIC.LINK.OK
 				bne CS.RUN.LINK
 				>LDYA L.MSG1.LINK.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 				bra CS.RUN.DUMPNET
 CS.RUN.LINK		>LDYA L.MSG1.LINK.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				>PUSHBI 0
 				>LDYA L.MSG1.LINKSPEED
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G DCB.NIC+S.DCB.NIC.SPEED
 				and #$0F
 				tax
@@ -195,41 +195,41 @@ CS.RUN.LINK		>LDYA L.MSG1.LINK.OK
 				>LDYA L.MSG1.DPLX.HD
 				bra .6
 .5				>LDYA L.MSG1.DPLX.FD
-.6				>SYSCALL puts
+.6				>SYSCALL PutS
 
 CS.RUN.DUMPNET	>PUSHBI 0
 				>LDYA L.MSG2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda ETKCFG+S.ETKCFG.NodID
 				beq .11
 				>LDYA L.MSG2.C
 				bra .10
 .11				>LDYA L.MSG2.U
-.10				>SYSCALL puts
+.10				>SYSCALL PutS
 
 				>PUSHB ETKCFG+S.ETKCFG.NodID
 				>PUSHW ETKCFG+S.ETKCFG.NetID
 
 				>PUSHBI 3
 				>LDYA L.MSG2.ADDR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>PUSHB ETKCFG+S.ETKCFG.Router
 				>PUSHW ETKCFG+S.ETKCFG.NetID
 				>PUSHBI 3
 				>LDYA L.MSG2.ROUTER
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>PUSHW L.ETKCFG.OBJECT
 
 				>PUSHBI 2
 				>LDYA L.MSG2.OBJECT
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
 				rts
 *--------------------------------------
 CS.RUN.PROBE	>PUSHBI 0
 				>LDYA L.MSG.PROBE
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				ldx #5
 
@@ -285,7 +285,7 @@ CS.RUN.PROBE	>PUSHBI 0
 				lda ETKCFG+S.NETCFG.DevID
 				>SYSCALL IOCTL
 				>LDYA L.MSG.PROBE.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				clc
 				rts
 *--------------------------------------
@@ -313,13 +313,13 @@ CFG.EtcFiles	>LDYAI 256
 				>LIBCALL hLIBETALK,LIBETALK.SETCFG
 
 				lda CFG.hBuf1
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .9				rts
 *--------------------------------------
 CFG.Read.PrintF >PUSHYA
 				>PUSHBI 2
 				>LDYA L.MSG.CFG
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CFG.Read.HOSTNAME
@@ -352,11 +352,11 @@ CFG.Read.Result	bcc .1
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.CFG.KO
-				>SYSCALL printf
+				>SYSCALL PrintF
 				sec
 				rts
 .1				>LDYA L.MSG.CFG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 *--------------------------------------
 CFG.Read.Open	stz CFG.hCfgFile
@@ -376,7 +376,7 @@ CFG.Read.Close	php
 
 CFG.Read.Close2	lda CFG.hCfgFile
 				beq .8
-				>SYSCALL fclose
+				>SYSCALL FClose
 .8				pla
 				plp
 				rts
diff --git a/BIN/FNT2FON.S.txt b/BIN/FNT2FON.S.txt
index 9d6f9e9f..182729a1 100644
--- a/BIN/FNT2FON.S.txt
+++ b/BIN/FNT2FON.S.txt
@@ -66,7 +66,7 @@ CS.INIT
 				dex
 				bne .2
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -87,7 +87,7 @@ CS.INIT
 .7				>LDA.G hOutputFile
 				beq .99
 				>LDYAI 8192				max 256x256 pixels
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.INIT.RTS
 				>STYA ZPCharBufPtr
 				txa
@@ -108,7 +108,7 @@ CS.INIT.OPENINPUT
 				>SYSCALL GetMemPtr
 				>STYA ZPInputBufPtr
 				>LDYA L.MSG.FILE.OK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				ldy #S.FNT.dfVersion
 				lda (ZPInputBufPtr),y
 				bne .99
@@ -139,11 +139,11 @@ CS.INIT.OPENINPUT
 				pla
 				>PUSHA
 				>LDYA L.MSG.HEADER.OK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				clc
 				rts
 .99				>LDYA L.MSG.HEADER.KO
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.IBIN
 				sec
 				rts
@@ -157,7 +157,7 @@ CS.INIT.CREATEOUTPUT
 				bcs .9
 				>STA.G hOutputFile
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPOutPutBufPtr
 				txa
@@ -185,7 +185,7 @@ CS.RUN			ldy #S.FNT.dfBreakChar
 				>STA.G CharIndex
 				>PUSHA
 				>LDYA L.MSG.RANGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDA.G FON.Header+S.FON.Last
 				sec
 				>SBC.G FON.Header+S.FON.First
@@ -200,7 +200,7 @@ CS.RUN			ldy #S.FNT.dfBreakChar
 				iny
 				sta (pData),y
 				ply
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPOutPutTblPtr
 				txa
@@ -281,7 +281,7 @@ CS.RUN.LOOP		>SLEEP
 				jsr CS.RUN.WriteBMAndTbl
 				bcs .9
 				>LDYA L.MSG.DONE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0
 				sec
 .9				rts
@@ -350,7 +350,7 @@ CS.RUN.DumpChar	>LDA.G CharOutByteW
 				>PUSHA
 				>PUSHA
 				>LDYA L.MSG.DUMP
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda ZPCharBufPtr
 				sta ZPPTR1
 				lda ZPCharBufPtr+1
@@ -666,7 +666,7 @@ CS.QUIT			>LDA.G hOutPutBuf
 
 .1				>LDA.G hOutputFile
 				beq .2
-				>SYSCALL fclose
+				>SYSCALL FClose
 .2				>LDA.G hInputBuf
 				beq .3
 				>SYSCALL FreeMem
diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 54fe88de..af5b8288 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -77,7 +77,7 @@ CS.INIT			>LDYA L.LIBBLKDEV
 .9				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				beq .99
 
 .1				inc Index
@@ -121,7 +121,7 @@ CS.RUN			ldy #S.PS.ARGC
 				
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .9				rts			
@@ -162,7 +162,7 @@ CS.RUN.Format	jsr CS.RUN.GetDevStatus
 				>PUSHEA.G VolName
 				
 				>PUSHBI 6
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				bit bLL
@@ -181,7 +181,7 @@ CS.RUN.Format	jsr CS.RUN.GetDevStatus
 				bcs .9
 
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0
 				sec
 				rts
@@ -192,7 +192,7 @@ CS.RUN.Format	jsr CS.RUN.GetDevStatus
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -220,7 +220,7 @@ CS.RUN.GetDevStatus
 				rts
 
 .9				>LDYA L.MSG.NOSIZE
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #MLI.E.IO
 				sec
 				rts
@@ -231,7 +231,7 @@ CS.RUN.LL		>LDA.G DIB+S.DIB.T
 				
 				>PUSHW L.MSG.LL
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				>PUSHEA.G IOCTL
@@ -244,7 +244,7 @@ CS.RUN.LL		>LDA.G DIB+S.DIB.T
 *--------------------------------------
 CS.RUN.LL.DISKII
 				>LDYAI 4096
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPPtr1
 				stx hMem
@@ -254,7 +254,7 @@ CS.RUN.LL.DISKII
 .1				>PUSHW L.MSG.LLDISK2
 				>PUSHB Index
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 
@@ -267,7 +267,7 @@ CS.RUN.LL.DISKII
 				
 				>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts				
 *--------------------------------------
 CS.RUN.InitCat	lda CatSize
@@ -333,7 +333,7 @@ CS.RUN.BuildCat	jsr .7
 *--------------------------------------
 CS.RUN.WriteCat	>PUSHW L.MSG.WRITECAT
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .1				>PUSHEA.G IOCTL
 				>PUSHBI IOCTL.WRITEBLOCK		
diff --git a/BIN/GREP.S.txt b/BIN/GREP.S.txt
index 55e0605b..e86a9e3e 100644
--- a/BIN/GREP.S.txt
+++ b/BIN/GREP.S.txt
@@ -100,7 +100,7 @@ CS.RUN
 .98				pha
 				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 .9				rts
@@ -192,10 +192,10 @@ CS.RUN.PRINT	>LDYA ZPBufPtr
 				>PUSHW L.MSG.NUMLINE
 				>PUSHW LineNum
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 .7				>LDYA ZPBufPtr
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 
 .8				clc
diff --git a/BIN/HTTPGET.S.txt b/BIN/HTTPGET.S.txt
index cafa01ba..8c78d16d 100644
--- a/BIN/HTTPGET.S.txt
+++ b/BIN/HTTPGET.S.txt
@@ -80,7 +80,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				lda (ZPIPCfgPtr)		Configured ?
 				bmi CS.RUN.IPOK
 				>LDYA L.MSG.IPKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -112,12 +112,12 @@ CS.RUN.IPOK		ldy #S.IPCFG.IP+3
 				>PUSHW L.MSG.UNKNOWN
 				>PUSHW ZPHostPtr
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bra CS.RUN.ESYN
 
 .9				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 CS.RUN.ESYN		lda #E.SYN
 				sec
@@ -202,7 +202,7 @@ CS.RUN.PORTOK	>PUSHW L.MSG.CONNECT
 				>PUSHW ZPHostPtr			
 				
 				>PUSHBI 8
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				lda #S.SOCKET.T.STREAM
@@ -218,7 +218,7 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 
 .9				pha
 				>LDYA L.MSG.SKTKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				pla
 				sec
 .99				rts
@@ -241,10 +241,10 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				bra .9
 
 .3				>LDYA L.MSG.CONNECTED
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				>LDYAI RESP.BUFSIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 
 				>STYA ZPRespBufPtr
@@ -258,7 +258,7 @@ CS.RUN.GET		jsr CS.RUN.ENCODE
 *				>PUSHW ZPEncodedBufLen
 *				>PUSHW ZPEncodedBufPtr
 *				ldy #S.PS.hStdOut
-*				lda (pPs),y
+*				lda (pPS),y
 *				>SYSCALL fwrite
 
 				jsr CS.RUN.REQUEST
@@ -276,7 +276,7 @@ CS.RUN.SKTERR	pha
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -287,7 +287,7 @@ CS.RUN.IOERR	pha
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -428,7 +428,7 @@ CS.RUN.RESPONSE jsr Init.Timeout
 .2				>PUSHYA					len
 				>PUSHW ZPRespBufPtr
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 				bcs .9
 
@@ -463,13 +463,13 @@ CS.QUIT			lda hSocket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.Shutdown
 .1				>LDA.G hReqBuf
 				beq .2
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .2				>LDA.G hEncodedBuf
 				beq .3
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .3				>LDA.G hRespBuf
 				beq .4
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .4				lda hLIBTCPIP
 				beq .8
 				>SYSCALL UnloadLib
diff --git a/BIN/IPCONFIG.S.DHCP.txt b/BIN/IPCONFIG.S.DHCP.txt
index 19c4eeb3..84fe5ceb 100644
--- a/BIN/IPCONFIG.S.DHCP.txt
+++ b/BIN/IPCONFIG.S.DHCP.txt
@@ -27,7 +27,7 @@ DHCP.INIT		lda IPCFG+S.NETCFG.STATUS
 
 .99				>LDYA L.MSG.DHCP.NA
 
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0
 				sec
 				rts
@@ -51,7 +51,7 @@ DHCP.RUN		>PUSHBI 0				no protocol
 				>LIBCALL hLIBTCPIP,LIBTCPIP.Connect
 				bcs .9
 				>LDYA L.MSG.DHCP.CFG1
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				jsr Init.Timeout
 DHCP.RUN.SDISC	>PUSHW L.SA.DEST
@@ -87,7 +87,7 @@ DHCP.RUN.SREQ	>PUSHW L.MSG.DHCP.CFG2
 				cpx #4
 				bne .1
 				>PUSHBI 4
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.SA.DEST
 				>PUSHWI DHCP.REQ.LEN
@@ -132,7 +132,7 @@ DHCP.RUN.OK		lda #S.IPCFG.STATUS.OK
 				bne .2
 				
 				>PUSHBI 8
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0					Leave with NO ERROR
 				sec
 				rts
@@ -142,7 +142,7 @@ DHCP.RUN.KO		pha
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
diff --git a/BIN/IPCONFIG.S.ETC.txt b/BIN/IPCONFIG.S.ETC.txt
index 85268bb8..054b0b9a 100644
--- a/BIN/IPCONFIG.S.ETC.txt
+++ b/BIN/IPCONFIG.S.ETC.txt
@@ -38,7 +38,7 @@ CFG.EtcFiles	>LDYAI 256
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SETCFG
 
 				lda CFG.hBuf1
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .9				rts
 *--------------------------------------
 CFG.Read.PrintF pha
@@ -46,7 +46,7 @@ CFG.Read.PrintF pha
 				pla
 				>PUSHYA
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CFG.Read.HOSTNAME
@@ -236,10 +236,10 @@ CFG.Read.HOSTS	stz CFG.hBuf2
 				pha
 				lda CFG.hBuf3
 				beq .90
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .90				lda CFG.hBuf2
 				beq .91
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .91				jmp CFG.Read.Close2
 *--------------------------------------
@@ -284,12 +284,12 @@ CFG.Read.Result	bcc .1
 				pla
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				sec
 				rts
 
 .1				>LDYA L.MSG.CFG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 *--------------------------------------
 CFG.Read.Open	stz CFG.hCfgFile
@@ -307,7 +307,7 @@ CFG.Read.Close	php
 				pha
 CFG.Read.Close2	lda CFG.hCfgFile
 				beq .8
-				>SYSCALL fclose
+				>SYSCALL FClose
 .8				pla
 				plp
 				rts
diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt
index 5a21bbe8..5d321e29 100644
--- a/BIN/IPCONFIG.S.txt
+++ b/BIN/IPCONFIG.S.txt
@@ -123,7 +123,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG
 				lda IPCFG+S.NETCFG.DevID
 				bne CS.RUN.SETUP
 				>LDYA L.MSG.NODEV
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #MLI.E.NODEV
 				sec
 				rts
@@ -150,7 +150,7 @@ CS.RUN.SETUP
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -231,7 +231,7 @@ CS.RUN.DUMPNIC	>PUSHW L.MSG1.DEV
 
 				>PUSHBI 11
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.MSG1.DEV.ARP
 				
@@ -242,7 +242,7 @@ CS.RUN.DUMPNIC	>PUSHW L.MSG1.DEV
 .2				>PUSHA
 				>PUSHBI 1	
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG1.DEV.IP
 				
@@ -256,21 +256,21 @@ CS.RUN.DUMPNIC	>PUSHW L.MSG1.DEV
 				>PUSHA		
 				>PUSHBI 1	
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDA.G DCB.NIC+S.DCB.NIC.LINK
 				and #S.DCB.NIC.LINK.OK
 				bne CS.RUN.LINK
 				>LDYA L.MSG1.LINK.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 				bra CS.RUN.DUMPIP
 
 CS.RUN.LINK		>LDYA L.MSG1.LINK.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				
 				>PUSHW L.MSG1.LINKSPEED
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>LDA.G DCB.NIC+S.DCB.NIC.SPEED
 				and #$0F
@@ -287,11 +287,11 @@ CS.RUN.LINK		>LDYA L.MSG1.LINK.OK
 				>LDYA L.MSG1.DPLX.HD
 				bra .6
 .5				>LDYA L.MSG1.DPLX.FD
-.6				>SYSCALL puts
+.6				>SYSCALL PutS
 
 CS.RUN.DUMPIP	>PUSHW L.MSG2
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda IPCFG+S.NETCFG.STATUS
 				and #S.IPCFG.STATUS.OK
@@ -299,7 +299,7 @@ CS.RUN.DUMPIP	>PUSHW L.MSG2
 				>LDYA L.MSG2.C
 				bra .10
 .11				>LDYA L.MSG2.U
-.10				>SYSCALL puts
+.10				>SYSCALL PutS
 
 				>PUSHW L.MSG2.DHCPSRVR
 				
@@ -311,7 +311,7 @@ CS.RUN.DUMPIP	>PUSHW L.MSG2
 				
 				>PUSHBI 4
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG2.IPMASK
 				
@@ -322,7 +322,7 @@ CS.RUN.DUMPIP	>PUSHW L.MSG2
 				bne .3
 				>PUSHBI 8
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG2.GW
 				
@@ -332,7 +332,7 @@ CS.RUN.DUMPIP	>PUSHW L.MSG2
 				cpx #4
 				bne .4
 				>PUSHBI 4
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG2.DNS
 				
@@ -343,14 +343,14 @@ CS.RUN.DUMPIP	>PUSHW L.MSG2
 				bne .5
 				>PUSHBI 8
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG2.HOSTNAME
 				>PUSHW L.IPCFG.HOSTNAME
 				>PUSHW L.IPCFG.DOMAIN
 				
 				>PUSHBI 4
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
 				rts
diff --git a/BIN/KCONFIG.S.txt b/BIN/KCONFIG.S.txt
index 981cee6e..18988aa6 100644
--- a/BIN/KCONFIG.S.txt
+++ b/BIN/KCONFIG.S.txt
@@ -76,7 +76,7 @@ CS.INIT			clc
 *--------------------------------------
 CS.RUN			>PUSHW L.MSG.TOPBAR
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				jsr CS.RUN.Load
 				bcs .1
 
@@ -87,22 +87,22 @@ CS.RUN			>PUSHW L.MSG.TOPBAR
 
 .2				>PUSHYA
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.MSG.KCONF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDYAI A2osX.KCONFIG
 				jsr CS.RUN.DumpConfYA
 
 				>PUSHW L.MSG.STATUSBAR
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 CS.RUN.REPaint	>PUSHW L.MSG.FCONF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDYA ZPCfgPtr
 				jsr CS.RUN.DumpConfYA
@@ -176,7 +176,7 @@ CS.RUN.Loop		>SYSCALL GetChar
 .8				>PUSHW L.MSG.QUIT
 .80				>PUSHBI 0
 				
-.9				>SYSCALL printf
+.9				>SYSCALL PrintF
 				lda #0
 				sec
 				rts
@@ -266,7 +266,7 @@ CS.RUN.DumpConfYA
 				>PUSHW L.MSG.HZ
 				>PUSHB (ZPTmp1)
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.MSG.CHROOT
 				
@@ -280,7 +280,7 @@ CS.RUN.DumpConfYA
 .10				>LDYA L.MSG.ENABLED
 .12				>PUSHYA
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.MSG.PMODE
 				
@@ -294,7 +294,7 @@ CS.RUN.DumpConfYA
 .14				>PUSHYA
 				>PUSHBI 2
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG.TTYS
 				
@@ -302,7 +302,7 @@ CS.RUN.DumpConfYA
 				lda (ZPTmp1),y
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				ldy #9					Slot 1
 
@@ -328,7 +328,7 @@ CS.RUN.DumpConfYA
 				>PUSHW T.MSG.SLOT.DESC,x
 				
 				>PUSHBI 3
-				>SYSCALL printf
+				>SYSCALL PrintF
 			
 				ply
 				iny
@@ -337,7 +337,7 @@ CS.RUN.DumpConfYA
 
 				>PUSHW L.MSG.PROMPT
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				clc
 				rts
diff --git a/BIN/KILL.S.txt b/BIN/KILL.S.txt
index 413cc53f..31dad945 100644
--- a/BIN/KILL.S.txt
+++ b/BIN/KILL.S.txt
@@ -71,7 +71,7 @@ CS.RUN			ldy #S.PS.ARGC
 
 .9				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda #E.SYN
 				sec
diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt
index 128ad2bd..c065eb22 100644
--- a/BIN/LS.S.txt
+++ b/BIN/LS.S.txt
@@ -101,7 +101,7 @@ CS.RUN
 				bne .8
 
 				ldy #S.PS.hCWD
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL GetMemPtr
 				jsr InitSrcDirYA
 				bcs .9
@@ -110,7 +110,7 @@ CS.RUN
 				>SYSCALL time
 				
 				>LDYAI S.PW
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPPW
 				txa
@@ -202,7 +202,7 @@ CS.RUN.PRINT.DEV
 				
 				>PUSHBI 8
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				ldy #bRecurse
@@ -235,7 +235,7 @@ CS.RUN.PRINT.DIR
 				jsr CS.RUN.PRINT.SRCPATH
 
 .23				>LDYA ZPFileName
-				>SYSCALL puts
+				>SYSCALL PutS
 				bcs .9
 				>LDA.G bRecurse
 				bpl .8
@@ -250,7 +250,7 @@ CS.RUN.PRINT.DIR
 .22				>PUSHW L.MSG.DIR
 				>PUSHW ZPFileName
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				ldy #0
@@ -282,7 +282,7 @@ CS.RUN.PRINT.DIR
 				jsr CS.RUN.PUSHDATES
 				>PUSHW ZPFileName
 				>PUSHBI 12
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				bcs .90
 				
@@ -313,13 +313,13 @@ CS.RUN.PRINT.FILE
 				jsr CS.RUN.PRINT.SRCPATH
 				
 .23				>LDYA ZPFileName
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 
 .22				>PUSHW L.MSG.FILE
 				>PUSHW ZPFileName
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				jmp CS.RUN.UpdateColCnt
 *--------------------------------------
@@ -356,7 +356,7 @@ CS.RUN.PRINT.FILE
 				>PUSHW ZPFileName
 
 				>PUSHBI 20
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .9				rts
 *--------------------------------------
@@ -366,7 +366,7 @@ CS.RUN.PRINT.SRCPATH
 				>SYSCALL GetMemPtr
 				>PUSHYA
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.PushGidUid
@@ -509,7 +509,7 @@ CS.RUN.NewLine	>LDA.G ColCount
 CS.RUN.NewLine.1
 				>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 CS.RUN.NewLine.8
 				clc
@@ -523,7 +523,7 @@ CS.RUN.ENTER.MSG
 				>PUSHYA
 				>PUSHBI 2
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.DOEVENT		sec
diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt
index 46344c38..b6bc1194 100644
--- a/BIN/LSDEV.S.txt
+++ b/BIN/LSDEV.S.txt
@@ -69,7 +69,7 @@ CS.RUN			jsr DumpDev
 .9				rts
 *--------------------------------------
 DumpDev			>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #1
 				stx Index
@@ -99,7 +99,7 @@ DumpDev			>LDYA L.MSG0
 				pla
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				bra .7
@@ -137,7 +137,7 @@ DumpDevFD		>PUSHW L.MSG1
 				
 				>PUSHBI 6
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 DumpDevDIB		>PUSHW L.MSG2
@@ -169,7 +169,7 @@ DumpDevDIB		>PUSHW L.MSG2
 
 				>PUSHBI 8
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				>LDA.G DEV.DIB+S.DIB.S
@@ -187,11 +187,11 @@ DumpDevDIB		>PUSHW L.MSG2
 .4				>PUSHW L.MSG2.C
 				>PUSHBI 0
 
-.8				>SYSCALL printf
+.8				>SYSCALL PrintF
 .9				rts
 *--------------------------------------
 DumpNod			>LDYA L.MSG3
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #2
 				stx Index
@@ -222,7 +222,7 @@ DumpNod			>LDYA L.MSG3
 				>PUSHYA
 				>PUSHBI 6
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 .7				inc index
 
diff --git a/BIN/LSOF.S.txt b/BIN/LSOF.S.txt
index ac820448..04c74f63 100644
--- a/BIN/LSOF.S.txt
+++ b/BIN/LSOF.S.txt
@@ -49,7 +49,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #1
 				stx FILE.ID
@@ -98,7 +98,7 @@ CS.RUN			>LDYA L.MSG0
 
 				>PUSHBI 6
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 .7				inc FILE.ID
 				ldx FILE.ID
diff --git a/BIN/MD5.S.txt b/BIN/MD5.S.txt
index b89eaed1..423516e4 100644
--- a/BIN/MD5.S.txt
+++ b/BIN/MD5.S.txt
@@ -53,7 +53,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				beq .99
 
 .1				inc ArgIndex
@@ -78,7 +78,7 @@ CS.RUN			ldy #S.PS.ARGC
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -109,7 +109,7 @@ CS.RUN.TEXT		lda Arg
 				jmp CS.RUN.PRINT
 *--------------------------------------
 CS.RUN.FILE		>LDYAI FILEBUF.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				
 				>STYA ZPDataBufPtr
@@ -155,7 +155,7 @@ CS.RUN.FILE		>LDYAI FILEBUF.SIZE
 				>SYSCALL MD5Finalize
 				
 CS.RUN.PRINT	>LEA.G MD5Buf
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0
 *				sec
 *				rts
@@ -170,7 +170,7 @@ CS.QUIT			lda hDataBuf
 .2				lda hFile
 				beq .3
 	
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 .3				clc
 				rts
diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt
index 064f2ff5..6f8e6002 100644
--- a/BIN/MEMDUMP.S.txt
+++ b/BIN/MEMDUMP.S.txt
@@ -60,7 +60,7 @@ CS.RUN			>LEA.G MemStat
 				>STYA ZPPTR1
 
 				>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 				>INC.G MEM.COUNT		skip slot 0
 
 CS.RUN.LOOP		>LDA.G bSTOP
@@ -100,7 +100,7 @@ CS.RUN.FOOTER	>SYSCALL GetChar
 				>PUSHB.G USED.COUNT
 				>PUSHB.G MEM.COUNT
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW L.MSG3
 				>PUSHW.G MemStat+S.MSTAT.MH
@@ -115,7 +115,7 @@ CS.RUN.FOOTER	>SYSCALL GetChar
 				ply
 				>PUSHYA
 				>PUSHBI 8
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				lda #0
 				sec
@@ -176,10 +176,10 @@ CS.RUN.PRINTMEM	>PUSHW L.MSG1
 				
 				>PUSHW L.MSG1.INV
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 	
 .12				>PUSHBI 9
-				>SYSCALL printf
+				>SYSCALL PrintF
 	
 				lda (ZPPTR1)
 				and #S.MEM.F.CODE
@@ -234,7 +234,7 @@ CS.RUN.PRINTMEM.BIN
 				>PUSHBI 2
 
 CS.RUN.PRINTMEM.OUT
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>INC.G LINE.COUNT
 				cmp #PAGELEN
 				beq .9
diff --git a/BIN/MORE.S.txt b/BIN/MORE.S.txt
index 8f21821a..c23b9826 100644
--- a/BIN/MORE.S.txt
+++ b/BIN/MORE.S.txt
@@ -82,7 +82,7 @@ CS.RUN
 				
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .9				rts
@@ -124,7 +124,7 @@ CS.RUN
 
 				>PUSHW L.MSG.Init
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 CS.RUN.LOOP		jsr CS.RUN.GETLINE
 				bcs	.9
@@ -238,23 +238,23 @@ CS.RUN.PRINT	lda bLineNum
 				>PUSHW L.MSG.NUMLINE
 				>PUSHW LineNum
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 .1				lda bEscCodes
 				bmi .2
 
 				>LDYA ZPBufPtr
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 				
 .2				>PUSHW ZPBufPtr
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts
 *--------------------------------------
 CS.QUIT			lda hBuf
diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt
index e535d002..041b931c 100644
--- a/BIN/NETSTAT.S.txt
+++ b/BIN/NETSTAT.S.txt
@@ -73,7 +73,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 .9				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 				>LIBCALL hLIBTCPIP,LIBTCPIP.GetTable
 				>STYA ZPPTR1
 				ldy SocketIndex
@@ -99,7 +99,7 @@ CS.RUN			>LDYA L.MSG0
 				jsr CS.RUN.T			..19
 				>PUSHBI 19
 				>LDYA L.MSG1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 .7				inc SocketIndex
 				ldy SocketIndex
diff --git a/BIN/NFSMOUNT.S.txt b/BIN/NFSMOUNT.S.txt
index c6910452..7e0c9513 100644
--- a/BIN/NFSMOUNT.S.txt
+++ b/BIN/NFSMOUNT.S.txt
@@ -51,13 +51,13 @@ CS.INIT			>SYSCALL ArgVC
 				dey
 				dex
 				bpl .1
-				lda (pPs)
+				lda (pPS)
 				ora #S.PS.F.EVENT		Now accept events
-				sta (pPs)
+				sta (pPS)
 				clc
 				rts
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
diff --git a/BIN/NSCUTIL.S.txt b/BIN/NSCUTIL.S.txt
index 3189659f..eca82a63 100644
--- a/BIN/NSCUTIL.S.txt
+++ b/BIN/NSCUTIL.S.txt
@@ -45,7 +45,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				bcs CS.RUN.SET
 			
@@ -61,7 +61,7 @@ CS.RUN.READ		jsr NSC.Init
 
 				>PUSHBI 0
 				>LDYA L.MSG.READ.KO
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #MLI.E.NODEV
 				sec
 				rts
@@ -70,7 +70,7 @@ CS.RUN.READ		jsr NSC.Init
 
 				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
 				rts
@@ -250,7 +250,7 @@ NSC.Dump		ldx #1
 				>PUSHA
 				>PUSHBI 2
 				>LDYA L.MSG.READ.OK1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>PUSHBI 2
 				>LDYA L.MSG.READ.OK2.24
 				bit DS1216E.DATA+4
@@ -258,10 +258,10 @@ NSC.Dump		ldx #1
 				
 				>LDYA L.MSG.READ.OK2.12
 
-.3				>SYSCALL printf
+.3				>SYSCALL PrintF
 				>PUSHBI 0
 				>LDYA L.MSG.READ.OK3
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda DS1216E.DATA
 				jsr PrintBCD
@@ -298,7 +298,7 @@ NSC.Dump		ldx #1
 				
 				>PUSHBI 0
 				>LDYA L.MSG.CRLF
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 PrintBCD		pha
diff --git a/BIN/PAK.S.txt b/BIN/PAK.S.txt
index 877c89b2..f65eaf09 100644
--- a/BIN/PAK.S.txt
+++ b/BIN/PAK.S.txt
@@ -87,7 +87,7 @@ CS.RUN			>INC.G ArgIndex
 				
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .99				rts
@@ -114,7 +114,7 @@ CS.RUN			>INC.G ArgIndex
 				beq .9
 
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPFullPath
 				txa
@@ -142,14 +142,14 @@ CS.RUN			>INC.G ArgIndex
 .98				bcs .99
 				
 				>LDYAI CHNK.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .98
 				>STYA ZPSrcBufPtr
 				txa
 				>STA.G hSrcBuf
 
 				>LDYAI CHNK.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .98
 				>STYA ZPDstBufPtr
 				txa
@@ -236,7 +236,7 @@ CS.RUN.DIR		lda bRecurse
 				
 				>PUSHBI 2
 				>LDYA L.MSG.DIR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				jsr CS.RUN.WriteArcHdrDir
@@ -256,7 +256,7 @@ CS.RUN.FILE		jsr CS.RUN.BuildFilePath
 				>LDA.G hArcFile
 				tay
 				lda OF.Table.hPath-1,y
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>SYSCALL strcmp
 				bcc .8
 
@@ -264,7 +264,7 @@ CS.RUN.FILE		jsr CS.RUN.BuildFilePath
 				
 				>PUSHBI 2
 				>LDYA L.MSG.FILE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 				jsr CS.RUN.WriteArcHdrFile
@@ -309,7 +309,7 @@ CS.RUN.FILE		jsr CS.RUN.BuildFilePath
 *--------------------------------------
 CS.RUN.CheckErr	bcs .1
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 				
 .1				pha
@@ -317,7 +317,7 @@ CS.RUN.CheckErr	bcs .1
 				>PUSHBI 1
 				>LDYA L.MSG.ERR
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				pla
 				sec
@@ -362,7 +362,7 @@ CS.RUN.ReadFile >PUSHWI CHNK.SIZE
 *--------------------------------------
 CS.RUN.CloseFile
 				>LDA.G hFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				bcs .9
 				
 				>STZ.G hFile
@@ -446,7 +446,7 @@ CS.RUN.AppendArc
 .9				rts
 
 .99				>LDYA L.MSG.E.IARC
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -575,7 +575,7 @@ CS.QUIT			jsr LeaveSubDir
 				
 .2				>LDA.G hArcFile
 				beq .3
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .3				>LDA.G hDstBuf
 				beq .4
diff --git a/BIN/PAKME.S.txt b/BIN/PAKME.S.txt
index bfac5c28..61f7d3bb 100644
--- a/BIN/PAKME.S.txt
+++ b/BIN/PAKME.S.txt
@@ -78,7 +78,7 @@ CS.INIT			>LDYA L.LIBPAK
 .9				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 
 				cmp #2
 				bne .9
@@ -101,7 +101,7 @@ CS.RUN			ldy #S.PS.ARGC
 				
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .99				rts
@@ -116,7 +116,7 @@ CS.RUN.START	>PUSHW ZPDstTableOfs
 				
 				>PUSHBI 9
 				>LDYA L.MSG.SRCFILE
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDYA ZPDstTableOfs
 				jsr CS.RUN.GetSrcBufYA
@@ -184,7 +184,7 @@ CS.RUN.LOOP		ldy #S.PS.hStdIn
 				>PUSHA
 				>PUSHBI 5
 				>LDYA L.MSG.CHUNK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 
 				jsr CS.RUN.Pak
@@ -389,14 +389,14 @@ CS.RUN.GetChunk	lda ZPChunkIndex
 .9				rts				
 *--------------------------------------
 CS.RUN.GetSrcBufYA
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				stx hSrcBuf
 				>STYA ZPSrcBufPtr
 .9				rts				
 *--------------------------------------
 CS.RUN.Pak		>LDYA ZPChunkLen
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				stx hDstBuf
 				>STYA ZPDstBufPtr
@@ -448,7 +448,7 @@ CS.RUN.WritePak	lda hDstFile
 				>PUSHW ZPChunkPakedLen
 				>PUSHBI 4
 				>LDYA L.MSG.PAKED
-				>SYSCALL printf				
+				>SYSCALL PrintF				
 				
 .9
 CS.RUN.WritePak.RTS
@@ -479,7 +479,7 @@ CS.RUN.WriteStore
 				>PUSHW ZPChunkLen
 				>PUSHBI 4
 				>LDYA L.MSG.STORE
-				>SYSCALL printf				
+				>SYSCALL PrintF				
 				
 .9				rts
 *--------------------------------------
@@ -516,11 +516,11 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			lda hDstFile
 				beq .2
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .2				lda hSrcFile
 				beq .3
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .3				jsr CS.QUIT.BUF
 
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index af803567..ac7c7413 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -73,7 +73,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				bmi .1
 
 				>LDYA L.MSG.IPKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -136,7 +136,7 @@ CS.RUN.IPOK		inc ArgIndex
 
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-.99				>SYSCALL printf
+.99				>SYSCALL PrintF
 
 				lda #E.SYN
 				sec
@@ -157,7 +157,7 @@ CS.RUN.ARGSOK	lda ArgHostName
 
 				>PUSHBI 6
 				>LDYA L.MSG.HOSTOK
-				>SYSCALL printf
+				>SYSCALL PrintF
 		
 CS.RUN.OPENSKT	ldx #3
 				ldy #S.IPCFG.IP+3
@@ -207,7 +207,7 @@ CS.RUN.OPENSKT	ldx #3
 				bcc CS.RUN.SEND.ECHO
 
 .9				>LDYA L.MSG.SKTKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -313,7 +313,7 @@ CS.Print.UNREACH
 
 				>PUSHBI 4
 				>LDYA L.MSG.UNREACH
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.Print.REPLY	lda #TIMEOUT.MAX
@@ -355,7 +355,7 @@ CS.Print.REPLY	lda #TIMEOUT.MAX
 
 				>PUSHBI 9
 				>LDYA L.MSG.REPLY
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.QUIT			lda hFrame
diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt
index bd6f9fb9..aa300a7c 100644
--- a/BIN/PS.S.txt
+++ b/BIN/PS.S.txt
@@ -78,7 +78,7 @@ CS.RUN			lda #1
 
 .10				>PUSHW L.MSG0
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				ldx Index
 
 .1				lda PS.Table.hPS,x
@@ -141,7 +141,7 @@ CS.RUN.DUMP		>SYSCALL GetMemPtr
 
 				>PUSHBI 10
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				jmp CS.RUN.PrintArgs
 .9				rts
@@ -175,7 +175,7 @@ CS.RUN.PrintArgs
 				>PUSHW L.MSG2
 				>PUSHW ZPArgV
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 .2				inc ZPArgV
 				bne .3
@@ -189,7 +189,7 @@ CS.RUN.PrintArgs
 
 .8				>PUSHW L.MSG3
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts
 *--------------------------------------
 CS.DOEVENT		sec
diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt
index 82e0a530..d19eed90 100644
--- a/BIN/RPCDUMP.S.txt
+++ b/BIN/RPCDUMP.S.txt
@@ -46,7 +46,7 @@ L.MSG.DUMP1		.DA MSG.DUMP1
 				.DA 0
 *--------------------------------------
 CS.INIT			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				beq .99
 
 				>LDYA L.LIBTCPIP
@@ -68,7 +68,7 @@ CS.INIT			ldy #S.PS.ARGC
 				clc
 				rts
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -89,7 +89,7 @@ CS.RUN			jsr Init.Timeout
 				>PUSHYA
 				>PUSHBI 2
 				>LDYA L.MSG.UNKNOWN
-				>SYSCALL printf
+				>SYSCALL PrintF
 				sec
 				rts
 .2				>PUSHW L.Socket
@@ -137,7 +137,7 @@ CS.RUN			jsr Init.Timeout
 				>PUSHYA
 				>PUSHBI 2
 				>LDYA L.MSG.TIMEOUT
-				>SYSCALL printf
+				>SYSCALL PrintF
 				sec
 				rts
 *--------------------------------------
@@ -183,7 +183,7 @@ DumpRPCFrame	lda #S.UDP+24
 				sta ZPFrameBase+1
 
 				>LDYA L.MSG.DUMP0
-				>SYSCALL puts
+				>SYSCALL PutS
 .1				ldy #3
 				lda (ZPFrameBase),y		Value follows?
 				beq .9
@@ -205,7 +205,7 @@ DumpRPCFrame	lda #S.UDP+24
 
 				>PUSHBI 8
 				>LDYA L.MSG.DUMP1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #20
 				clc
 				adc ZPFrameBase
diff --git a/BIN/SH.S.CL.txt b/BIN/SH.S.CL.txt
index bdb835fd..4c68b373 100644
--- a/BIN/SH.S.CL.txt
+++ b/BIN/SH.S.CL.txt
@@ -20,13 +20,13 @@ CL.PrintPrompt	>PUSHW L.PS1
 				>PUSHYA
 				>PUSHBI 0
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				>SYSCALL FreeMem
 
 .1				>PUSHW L.MSG.PROMPT
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts
 *--------------------------------------
 CL.READN0A		tax
@@ -294,7 +294,7 @@ CL.PrintEOL.8	clc
 CL.PrintCLBuf	>PUSHW ZPCLBuf
 
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fputs
 				rts
 *--------------------------------------
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 3103020b..d6de9932 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -106,7 +106,7 @@ CMD.CD.YA		>PUSHYA
 				lda #MLI.E.INVPATH
 .19				pha
 				lda ZPTmpW
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				pla
 				sec
 				rts
@@ -127,11 +127,11 @@ CMD.CD.YA		>PUSHYA
 *--------------------------------------
 CMD.SetCWDA		pha
 				ldy #S.PS.hCWD
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL FreeMem
 				pla
 				ldy #S.PS.hCWD
-				sta (pPs),y
+				sta (pPS),y
 				lda #0
 *				clc
 				rts
@@ -151,14 +151,14 @@ CMD.SET			lda (ZPArgVBufPtr)
 				beq .8					Ending 0 ?
 
 				>LDYA ZPPTR1
-				>SYSCALL puts
+				>SYSCALL PutS
 				bcs .9
 
 				jsr GetPtr1NextString
 				bra .1
 
 .8				lda ZPTmpW
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 *				clc
 .9				rts
 *--------------------------------------
@@ -235,7 +235,7 @@ CMD.SET.GET		>PUSHW ZPVarNamePtr
 				bcs .8
 				
 				>LDYA ZPCLBuf
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 				
 .8				clc
@@ -280,7 +280,7 @@ CMD.DATE		>PUSHEA.G TimeBuf
 				>SYSCALL StrFTime
 
 CMD.DATE.PRINT	>LDYA ZPCLBuf
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 *--------------------------------------
 CMD.ECHO		stz ZPPtr1				echo -N
@@ -316,7 +316,7 @@ CMD.ECHO		stz ZPPtr1				echo -N
 
 				>PUSHW L.MSG.ECHOCRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts
 
 .8				clc
@@ -418,7 +418,7 @@ CMD.MD			lda (ZPArgVBufPtr)
 *--------------------------------------
 CMD.PWD			jsr GetCWD
 
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 *--------------------------------------
 CMD.RD			lda (ZPArgVBufPtr)
@@ -474,7 +474,7 @@ CMD.REN			lda (ZPArgVBufPtr)
 				tay
 				lda #0
 				
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .90
 				>STYA ZPPtr2
 				stx ZPTmpW+1
@@ -503,7 +503,7 @@ CMD.REN			lda (ZPArgVBufPtr)
 				>SYSCALL strcat
 				
 				lda ZPTmpW
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				lda ZPTmpW+1
 				sta ZPTmpW
 				
@@ -514,7 +514,7 @@ CMD.REN			lda (ZPArgVBufPtr)
 .90				php
 				pha
 				lda ZPTmpW
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				pla
 				plp
 				rts
@@ -636,7 +636,7 @@ CMD.EXIT		lda (ZPArgVBufPtr)
 				bcs .9
 				
 .1				ldy #S.PS.RC
-				sta (pPs),y
+				sta (pPS),y
 
 .2				jsr CORE.StkPull		Pull everything until CALL . CL...
 				bcs .9
@@ -664,7 +664,7 @@ CMD.EXIT.FILE	jsr CORE.StkPullFree	Code buffer
 
 				ldy #S.PS.hARGV
 				lda (pPS),y
-				>SYSCALL freemem		ArgV buffer
+				>SYSCALL FreeMem		ArgV buffer
 
 				jsr CORE.StkPull
 				ldy #S.PS.hARGV
@@ -682,7 +682,7 @@ CMD.EXIT.FILE	jsr CORE.StkPullFree	Code buffer
 				sta ZPInputBuf
 
 				ldy #S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 				
 				clc
 				rts
@@ -954,9 +954,9 @@ CMD.NEXT.LIST	lda (pData),y			Y = StkPtr
 				pha
 				dey
 				lda (pData),y			hLIST
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				pla
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 *				clc
 .9				rts
 *--------------------------------------
@@ -1054,9 +1054,9 @@ CMD.NEXT.FILEEXEC.POP
 				pha
 				dey
 				lda (pData),y			hFILE/hPIPE
-				>SYSCALL fclose
+				>SYSCALL FClose
 				pla
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 *				clc
 				rts
 *--------------------------------------
@@ -1200,7 +1200,7 @@ CMD.IsSwitch	lda (ZPArgVBufPtr)
 CMD.PrintArgVBufPtr
 				>PUSHW ZPArgVBufPtr
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 MAN
diff --git a/BIN/SH.S.CORE.txt b/BIN/SH.S.CORE.txt
index 9536e711..8de47ac2 100644
--- a/BIN/SH.S.CORE.txt
+++ b/BIN/SH.S.CORE.txt
@@ -271,7 +271,7 @@ CORE.Run.Exit	php
 				pha
 				>LDA.G CORE.hArgVBuf
 				beq .1
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 				>STZ.G CORE.hArgVBuf
 				
@@ -319,7 +319,7 @@ CORE.ExecExtCmd	>PUSHW ZPArgVBuf
 .4				>SLEEP					Suspend this PID
 				sec
 				ldy #S.PS.RC			CPID will update S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 				bne .9
 
 .8				clc
@@ -483,7 +483,7 @@ CORE.ArgV.Add	lda #C.SPACE
 				inc ZPArgVBufPtr+1
 
 .8				pla
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .9				rts
 *--------------------------------------
 CORE.ArgV.Next	lda (ZPArgVBufPtr)
@@ -758,12 +758,12 @@ CORE.StkPullInputBufPtr
 *--------------------------------------
 CORE.StkPullFClose
 				jsr CORE.StkPull
-				>SYSCALL fclose
+				>SYSCALL FClose
 				rts
 *--------------------------------------
 CORE.StkPullFree
 				jsr CORE.StkPull
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				rts
 *--------------------------------------
 CORE.StkPull	jsr CORE.StkGet
diff --git a/BIN/SH.S.EXP.txt b/BIN/SH.S.EXP.txt
index 37df8456..57c3eef4 100644
--- a/BIN/SH.S.EXP.txt
+++ b/BIN/SH.S.EXP.txt
@@ -41,7 +41,7 @@ EXP.GET			jsr CORE.ArgV.Next
 EXP.FPU.EXEC	ldy CORE.Operator
 				ldx EXP.OP.MATH.FPU,y
 
-				jmp A2osX.FpuCall
+				jmp A2osX.FPUCALL
 *--------------------------------------
 EXP.TEST		lda (ZPArgVBufPtr)
 				beq .9
diff --git a/BIN/SH.S.IO.txt b/BIN/SH.S.IO.txt
index 95930ed1..eaedbb68 100644
--- a/BIN/SH.S.IO.txt
+++ b/BIN/SH.S.IO.txt
@@ -127,7 +127,7 @@ IO.Reset.Err	>LDA.G IO.hErr
 *--------------------------------------
 IO.Close.Y		pha
 				lda (pPS),y
-				>SYSCALL fclose
+				>SYSCALL FClose
 				pla
 				rts
 *--------------------------------------
@@ -161,7 +161,7 @@ IO.PrintBatchErrMsg
 				>LDYA ZPInputBuf
 				>STYA ZPPtr1
 				ldy #S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #E.SYN
 				beq .10
 
@@ -254,7 +254,7 @@ IO.PrintErrMsg	ldx L.ERR.Codes
 				stx ZPPTR1+1
 
 				ldy #S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 
 				ldy #0
 
@@ -281,7 +281,7 @@ IO.PrintErrMsg	ldx L.ERR.Codes
 				>PUSHW L.MSG.ERROR
 				
 				ldy #S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 				
 				>PUSHA
 				>PUSHW ZPPTR1
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index f7a7c604..e7bd2d2d 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -226,7 +226,7 @@ CS.RUN			jsr CL.Init
 				>PUSHB #K.VER
 				>PUSHB /K.VER
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs CS.INIT.RTS
 
 				>LDYA L.HOME.PROFILE
@@ -324,7 +324,7 @@ CS.RUN.INTERACTIVE
 
 				>PUSHW L.MSG.PROMPTCRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				lda (ZPCLBuf)
 				beq .8					Empty line
@@ -366,13 +366,13 @@ CS.RUN.BATCH	>LDA.G bSET.X
 .4				>PUSHW L.MSG.TRACE
 				>PUSHW ZPCLBuf
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs CS.RUN.LOOP.RTS
 
 .5				jsr CORE.Run
 
 CS.RUN.LOOP.END	ldy #S.PS.RC
-				sta (pPs),y
+				sta (pPS),y
 				bcc CS.RUN.LOOP.80
 				tay
 				beq CS.RUN.LOOP.80		0 = EOF
@@ -411,7 +411,7 @@ CS.RUN.LOOP.80	lda (pData)				something on stack ?
 CS.RUN.LOOP.88	jmp CS.RUN.LOOP
 CS.RUN.LOOP.EXIT
 				ldy #S.PS.RC
-				lda (pPs),y
+				lda (pPS),y
 				sec
 CS.RUN.LOOP.RTS	rts
 *--------------------------------------
diff --git a/BIN/STAT.S.txt b/BIN/STAT.S.txt
index 173df051..6477052c 100644
--- a/BIN/STAT.S.txt
+++ b/BIN/STAT.S.txt
@@ -68,7 +68,7 @@ CS.RUN
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -109,15 +109,15 @@ CS.RUN.DUMP		lda ArgFile
 				>PUSHW L.MSG.Filename
 				>PUSHW ZPPtr1
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 				jsr Mod2CSTR
 				>PUSHW L.MSG.Mode
 				>PUSHEA.G MOD
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHW L.MSG.UIDGIDSIZE
 				>PUSHW.G StatBuf+S.STAT.UID
@@ -125,7 +125,7 @@ CS.RUN.DUMP		lda ArgFile
 				>PUSHL.G StatBuf+S.STAT.SIZE
 				>PUSHL.G StatBuf+S.STAT.BLOCKS
 				>PUSHBI 12
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				jsr CS.RUN.PrintAMCTime
 				
@@ -211,7 +211,7 @@ CS.RUN.PrintAMCTime
 				>PUSHEA.G TIME.Mod
 				>PUSHEA.G TIME.Access
 				>PUSHBI 6
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.PrintAMCTime.NODATE
diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt
index 9b9dc570..08001d37 100644
--- a/BIN/TELNET.S.txt
+++ b/BIN/TELNET.S.txt
@@ -72,13 +72,13 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				bmi CS.RUN.IPOK
 				
 				>LDYA L.MSG.IPKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
 
 CS.RUN.IPOK		ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				bcc .9
 				ldy #S.IPCFG.IP+3
@@ -108,11 +108,11 @@ CS.RUN.IPOK		ldy #S.PS.ARGC
 				>PUSHYA
 				>PUSHBI 2
 				>LDYA L.MSG.UNKNOWN
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bra .99
 
 .9				>LDYA L.MSG.USAGE
-				>SYSCALL puts
+				>SYSCALL PutS
 
 .99				lda #E.SYN
 				sec
@@ -137,7 +137,7 @@ CS.RUN.PORTOK	lda #1
 
 				>PUSHBI 8
 				>LDYA L.MSG.HOSTOK
-				>SYSCALL printf
+				>SYSCALL PrintF
 		
 CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				lda #S.SOCKET.T.STREAM
@@ -153,7 +153,7 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 
 .9				pha
 				>LDYA L.MSG.SKTKO
-				>SYSCALL puts
+				>SYSCALL PutS
 				pla
 				sec
 .99				rts
@@ -179,9 +179,9 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				
 .4				>PUSHBI 0
 				>LDYA L.MSG.SKTOK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				>LDYAI BUFSIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				
 				>STYA ZPBufPtr
@@ -204,12 +204,12 @@ CS.RUN.LOOP		>SLEEP
 				>PUSHYA					len
 				>PUSHW ZPBufPtr
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 				bcs .11
 
 .2				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 
 				>SYSCALL feof
 				bcs .11					CS.RUN.IOERR
@@ -219,7 +219,7 @@ CS.RUN.LOOP		>SLEEP
 				>PUSHWI BUFSIZE			
 				>PUSHW ZPBufPtr
 				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fread
 .11				bcs CS.RUN.IOERR
 
@@ -240,7 +240,7 @@ CS.RUN.SKTERR	pha
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.SKTERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
@@ -249,13 +249,13 @@ CS.RUN.IOERR	pha
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.IOERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				pla
 				sec
 				rts
 *--------------------------------------
 CS.RUN.USER		>LDYA L.MSG.USER
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0
 				sec
 				rts
@@ -276,7 +276,7 @@ CS.QUIT			lda hSocket
 .1				lda hBuf
 				beq .2
 
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .2				lda hLIBTCPIP
 				beq .8
diff --git a/BIN/TERM.S.txt b/BIN/TERM.S.txt
index 9d835e67..77abfdca 100644
--- a/BIN/TERM.S.txt
+++ b/BIN/TERM.S.txt
@@ -63,10 +63,10 @@ CS.RUN			lda #1
 				
 				stx hDev
 				>LDYA L.MSG.DEVOK
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				>LDYAI BUFSIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				
 				>STYA ZPBufPtr
@@ -75,7 +75,7 @@ CS.RUN			lda #1
 				bra CS.RUN.LOOP
 
 .9				>LDYA L.MSG.USAGE
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #E.SYN
 				sec
@@ -99,12 +99,12 @@ CS.RUN.LOOP		>SLEEP
 .1				>PUSHYA					len
 				>PUSHW ZPBufPtr
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 				bcs .9
 
 .2				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 
 				>SYSCALL feof
 				bcs .9
@@ -114,7 +114,7 @@ CS.RUN.LOOP		>SLEEP
 				>PUSHWI BUFSIZE			
 				>PUSHW ZPBufPtr
 				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fread
 .3				bcs .9
 
@@ -144,12 +144,12 @@ CS.DOEVENT		lda (pEvent)
 CS.QUIT			lda hDev
 				beq .1
 
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 .1				lda hBuf
 				beq .2
 
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .2				clc
 				rts
diff --git a/BIN/UNPAK.S.txt b/BIN/UNPAK.S.txt
index 288d8188..c828026b 100644
--- a/BIN/UNPAK.S.txt
+++ b/BIN/UNPAK.S.txt
@@ -63,7 +63,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			>LDYAI CHNK.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				>STYA ZPInBufPtr
 				txa
@@ -77,7 +77,7 @@ CS.RUN			>LDYAI CHNK.SIZE
 				bcs .9
 				
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 
 				>STYA ZPFullPathPtr
@@ -90,12 +90,12 @@ CS.RUN			>LDYAI CHNK.SIZE
 
 				ldy #S.PS.hCWD
 				lda (pPS),y
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 
 .1				jsr CS.RUN.SetupPath
 
 				>LDYAI CHNK.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 
 				txa
@@ -110,7 +110,7 @@ CS.RUN			>LDYAI CHNK.SIZE
 
 .99				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -153,7 +153,7 @@ CS.RUN.LOOP		jsr CS.RUN.GetByte
 				jsr CS.RUN.CheckDir
 				bcs .99
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				bra CS.RUN.LOOP
 				clc
 .99				rts
@@ -202,7 +202,7 @@ CS.RUN.LOOP		jsr CS.RUN.GetByte
 				sta ZPOutBufLen+1
 
 				>LDA.G hOutBuf
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPOutBufPtr
 				
 				jsr X.Unpak
@@ -223,15 +223,15 @@ CS.RUN.LOOP		jsr CS.RUN.GetByte
 				jmp .10			
 
 .8				>LDA.G hFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 				rts
 *--------------------------------------
 CS.RUN.PrintFN	>PUSHW ZPFullPathPtr
 				>PUSHBI 2
 				>LDYA L.MSG.DIR,x
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.OpenArc	pha
@@ -262,7 +262,7 @@ CS.RUN.OpenArc	pha
 .99
 CS.RUN.E.IARC	>PUSHBI 0
 				>LDYA L.MSG.E.IARC
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -294,7 +294,7 @@ CS.RUN.GetFileName
 *--------------------------------------
 CS.RUN.ReadData >PUSHW ZPInBufLen
 				>LDA.G hInBuf
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPInBufPtr
 				>PUSHYA
 				>LDA.G hArcFile
@@ -338,7 +338,7 @@ CS.RUN.OpenFile	>PUSHW.G FileAuxType
 CS.RUN.WriteFile
 				>PUSHW ZPOutBufLen
 				>LDA.G hOutBuf
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>PUSHYA
 				>LDA.G hFile
 				>SYSCALL fwrite
@@ -349,7 +349,7 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			>LDA.G hFile
 				beq .1
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 .1				>LDA.G hFullPath
 				beq .2
@@ -366,7 +366,7 @@ CS.QUIT			>LDA.G hFile
 
 .4				>LDA.G hArcFile
 				beq .8
-				>SYSCALL fclose
+				>SYSCALL FClose
 			
 .8				clc
 				rts
diff --git a/BIN/USERADD.S.txt b/BIN/USERADD.S.txt
index 3de8fe7c..e93bd268 100644
--- a/BIN/USERADD.S.txt
+++ b/BIN/USERADD.S.txt
@@ -72,14 +72,14 @@ CS.INIT			clc
 * if RUN exits with CC, RN entered again
 *--------------------------------------
 CS.RUN			>LDYAI S.PW
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				
 				>STYA ZPPWPtr
 				stx ZPhPW
 				
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				
 				>STYA ZPStrPtr
@@ -116,7 +116,7 @@ CS.RUN			>LDYAI S.PW
 
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .99				rts
@@ -136,7 +136,7 @@ CS.RUN.ROOT		ldy #0
 
 				>PUSHBI 0
 				>LDYA L.MSG.ROOTPWD1
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .90
 				jsr CS.RUN.GetStr
 				bcs .90
@@ -146,7 +146,7 @@ CS.RUN.ROOT		ldy #0
 				>SYSCALL MD5
 				>PUSHBI 0
 				>LDYA L.MSG.ROOTPWD2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				jsr CS.RUN.GetStr
 .90				bcs .9
@@ -168,7 +168,7 @@ CS.RUN.ROOT		ldy #0
 .9				rts
 .99				>PUSHBI 0
 				>LDYA L.MSG.MISMATCH
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -204,14 +204,14 @@ CS.RUN.GetStr	stz ZPStrLen
 				bmi .1
 				>PUSHBI 0
 				>LDYA L.MSG.BS
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bra .1
 .8				ldy ZPStrLen
 				lda #0
 				sta (ZPStrPtr),y
 				>PUSHBI 0
 				>LDYA L.MSG.CRLF
-				>SYSCALL printf
+				>SYSCALL PrintF
 .9				rts	
 *--------------------------------------
 CS.RUN.CheckArg	inc ArgIndex
@@ -277,7 +277,7 @@ CS.RUN.CheckArg	inc ArgIndex
 				rts
 .9				>PUSHBI 0
 				>LDYA L.MSG.DUP
-				>SYSCALL printf	
+				>SYSCALL PrintF	
 CS.RUN.CheckArg.9
 				lda #E.SYN
 				sec
@@ -351,10 +351,10 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			lda ZPhStr
 				beq .1
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .1				lda ZPhPW
 				beq .2
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .2				clc
 				rts
 *--------------------------------------
diff --git a/BIN/USERDEL.S.txt b/BIN/USERDEL.S.txt
index 9bc4c262..9b589bdb 100644
--- a/BIN/USERDEL.S.txt
+++ b/BIN/USERDEL.S.txt
@@ -57,12 +57,12 @@ CS.INIT			clc
 * if RUN exits with CC, RN entered again
 *--------------------------------------
 CS.RUN			>LDYAI S.PW
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPPWPtr
 				stx ZPhPW
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPStrPtr
 				stx ZPhStr
@@ -89,7 +89,7 @@ CS.RUN			>LDYAI S.PW
 
 .9				>PUSHBI 0
 				>LDYA L.MSG.INV
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.IUSR
 				sec
 				rts
@@ -120,7 +120,7 @@ CS.RUN.CheckArg	inc ArgIndex
 
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -183,10 +183,10 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			lda ZPhStr
 				beq .8
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .1				lda ZPhPW
 				beq .8
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 .8				clc
 				rts
 *--------------------------------------
diff --git a/BIN/WC.S.txt b/BIN/WC.S.txt
index 44f405fc..8af48466 100644
--- a/BIN/WC.S.txt
+++ b/BIN/WC.S.txt
@@ -84,7 +84,7 @@ CS.RUN			>INC.G ArgIndex
 
 .9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -112,7 +112,7 @@ CS.RUN			>INC.G ArgIndex
 				jmp CS.RUN.PIPE
 
 .6				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPFullPath
 				txa
@@ -137,7 +137,7 @@ CS.RUN			>INC.G ArgIndex
 				sta ZPRelPath+1
 
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPLineBuf
 				txa
@@ -196,7 +196,7 @@ CS.RUN.LOOP		ldy #S.PS.hStdIn
 .99				rts
 *--------------------------------------
 CS.RUN.PIPE		>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 				>STYA ZPLineBuf
 				txa
@@ -319,7 +319,7 @@ CS.RUN.CheckErr	bcc .9
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.MSG.ERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda bContinue
 				eor #$80
 				asl
@@ -357,7 +357,7 @@ CS.RUN.OpenFile	ldx #12
 *--------------------------------------
 CS.RUN.CloseFile
 				>LDA.G hFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				bcs .9
 				>STZ.G hFile
 .9				rts
@@ -431,7 +431,7 @@ CS.RUN.PrintFstat
 				adc #2
 				>PUSHA
 				>LDYA L.MSG.FILE1-2,x
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 				
 .4				>PUSHL.G fWordCount
@@ -439,7 +439,7 @@ CS.RUN.PrintFstat
 				>PUSHL.G fCharCount
 				>PUSHBI 14
 				>LDYA L.MSG.FILE3
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.PrintTstat
@@ -474,7 +474,7 @@ CS.RUN.PrintTstat
 				asl
 				>PUSHA
 				>LDYA L.MSG.TOTAL1-2,x
-				>SYSCALL printf
+				>SYSCALL PrintF
 .8				rts
 				
 .4				>PUSHL.G tWordCount
@@ -482,7 +482,7 @@ CS.RUN.PrintTstat
 				>PUSHL.G tCharCount
 				>PUSHBI 12
 				>LDYA L.MSG.TOTAL3
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.DOEVENT		sec
diff --git a/BIN/WHO.S.txt b/BIN/WHO.S.txt
index ba18f2e8..61f4a774 100644
--- a/BIN/WHO.S.txt
+++ b/BIN/WHO.S.txt
@@ -45,7 +45,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #1
 				stx SessionID
@@ -87,7 +87,7 @@ CS.RUN			>LDYA L.MSG0
 
 				>PUSHBI 9				total = 9 ... bytes
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .9
 				
 .7				inc SessionID
diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt
index 4abbede6..262442ae 100644
--- a/BIN/X.CPMVRM.S.txt
+++ b/BIN/X.CPMVRM.S.txt
@@ -66,7 +66,7 @@ CS.INIT
 
 .99				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 				rts
@@ -105,21 +105,21 @@ CS.INIT
 				>LDA.G hDstBasePath
 				bne .8					we also have a Dst folder
 				ldy #S.PS.hCWD			no dst folder, use actual prefix
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL GetMemPtr
 				jsr InitDstDirYA
 				bcs .99
 				.FIN
 
 .8				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				txa
 				>STA.G hSrcFullPath
 
 				.DO X.COPY.TO.DEST=1
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 				txa
 				>STA.G hDstFullPath
@@ -130,7 +130,7 @@ CS.INIT.RTS		rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.hStdIn
 				lda (pPS),y
-				>SYSCALL feof
+				>SYSCALL FEOF
 				bcs CS.INIT.RTS			I/O error
 				tay
 				bne .15
@@ -200,7 +200,7 @@ CS.RUN			ldy #S.PS.hStdIn
 				ldy #hSrcFullPath
 				jsr CS.RUN.GetPathY
 				>PUSHYA
-				>SYSCALL remove
+				>SYSCALL Remove
 				bcs .22
 				jsr CS.RUN.CheckErr		Success!!!
 				jsr CS.RUN.IncCount
@@ -257,7 +257,7 @@ CS.RUN.LEAVE 	jsr LeaveSubDir			exit this sub dir....
 				ldy #hSrcFullPath
 				jsr CS.RUN.GetPathY
 
-				>SYSCALL remove
+				>SYSCALL Remove
 				jsr CS.RUN.CheckErr
 				bcs .99
 *				.FIN
@@ -276,7 +276,7 @@ CS.RUN.LEAVE 	jsr LeaveSubDir			exit this sub dir....
 				>PUSHB (pData),y
 				>PUSHBI 2
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 .91				ldy #RC
 				lda (pData),y			get global RC in case of bContinue
@@ -325,7 +325,7 @@ CS.RUN.DIR		.DO X.COPY.TO.DEST=1
 				bra .4
 .3				ldy #hDstFullPath
 				jsr CS.RUN.GetPathY
-				>SYSCALL mkdir
+				>SYSCALL MKDir
 .4				jsr CS.RUN.CheckErr
 				bcs CS.RUN.DIR.RTS
 				jsr CS.RUN.IncCount
@@ -443,7 +443,7 @@ CS.RUN.FILE.MSG clc
 
 				.FIN
 
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 
 .8				clc
@@ -460,13 +460,13 @@ CS.RUN.OVERWRITE.MSG
 				jsr CS.RUN.GetPathY
 				>PUSHYA
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 				.FIN
 *--------------------------------------
 CS.RUN.CR		>PUSHW L.MSG.CRLF
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 				.DO X.COPY.TO.DEST=1
@@ -509,7 +509,7 @@ CS.RUN.CopyStart
 
 .9				pha
 				>LDA.G hSrcFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				pla
 				sec
 				
@@ -536,7 +536,7 @@ CS.RUN.Open		pha						Save open mode
 *--------------------------------------
 CS.RUN.Copy		>STZ.G hCopyBuf
 				>LDYAI X.COPY.BUF.SIZE
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 
 				>STYA ZPPtr1
@@ -575,10 +575,10 @@ CS.RUN.Copy		>STZ.G hCopyBuf
 				>SYSCALL FreeMem
 *--------------------------------------
 CS.RUN.CopyEnd	>LDA.G hSrcFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 				>LDA.G hDstFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 				>STZ.G bCopy
 				clc
@@ -591,7 +591,7 @@ CS.RUN.CheckErr	bcs .1
 				bmi .8
 
 				>LDYA L.MSG.OK
-				>SYSCALL puts
+				>SYSCALL PutS
 .8				rts
 
 .1				pha
@@ -600,7 +600,7 @@ CS.RUN.CheckErr	bcs .1
 				pha
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>LDA.G bContinue
 				eor #$80
@@ -669,10 +669,10 @@ CS.QUIT			jsr LeaveSubDir
 				bpl .1
 
 				>LDA.G hSrcFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 				>LDA.G hDstFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 .1				ldy #hDstFullPath
 				jsr .7
diff --git a/BIN/X.FILEENUM.G.txt b/BIN/X.FILEENUM.G.txt
index c8522064..8c9d17df 100644
--- a/BIN/X.FILEENUM.G.txt
+++ b/BIN/X.FILEENUM.G.txt
@@ -2,7 +2,7 @@ NEW
   AUTO 3,1
 				.LIST OFF
 *--------------------------------------	
-Index			.BS 1
+index			.BS 1
 hDIRs			.BS X.MAX.RECURSE+1
 hDIRENTs		.BS X.MAX.RECURSE+1
 oDIRENTs		.BS X.MAX.RECURSE*2
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 9f8ffd72..25423a59 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -39,7 +39,7 @@ L.FD.DEV.NAME	.DA FD.DEV.NAME
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda MACHID
 				and #MACHID.T
 				cmp #MACHID.T.IIc
@@ -76,7 +76,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				bit DCB+S.DCB.GFX.S
 				bmi .3
 				>LDYA L.MSG.DETECT.80C
-.3				>SYSCALL puts			
+.3				>SYSCALL PutS			
 
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt
index b32a447f..2933230e 100644
--- a/DRV/LANCEGS.DRV.S.txt
+++ b/DRV/LANCEGS.DRV.S.txt
@@ -47,7 +47,7 @@ L.MAC5			.DA DCB+S.DCB.NIC.MAC+5
 Dev.Detect		>STYA ARGS
 
 				>LDYA L.MSG.DETECT
-				>SYSCALL puts
+				>SYSCALL PutS
 				ldx #$70
 				ldy #7
 
@@ -67,7 +67,7 @@ Dev.Detect		>STYA ARGS
 				bne .1
 	
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #MLI.E.NODEV
 				sec
@@ -82,7 +82,7 @@ Dev.Detect		>STYA ARGS
 .8				>PUSHW L.MSG.DETECT.OK
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/DRV/MKBOARD.DRV.S.txt b/DRV/MKBOARD.DRV.S.txt
index 4dbdd0de..a732184c 100644
--- a/DRV/MKBOARD.DRV.S.txt
+++ b/DRV/MKBOARD.DRV.S.txt
@@ -60,7 +60,7 @@ Dev.Detect		>STYA ARGS
 				bne .1
 
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #MLI.E.NODEV		Not Found in any slot, exiting
 				sec
@@ -86,7 +86,7 @@ Dev.Detect		>STYA ARGS
 .8				>PUSHW L.MSG.DETECT.OK
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index 26f60b80..214277d6 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -38,7 +38,7 @@ L.FD.DEV.NAME	.DA FD.DEV.NAME
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				stz ZPSlotPtr
 				lda #$C1
@@ -57,7 +57,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				cmp #$C8
 				bne .1	
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .9				lda #MLI.E.NODEV
 				sec
@@ -78,7 +78,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL printf
+				>SYSCALL PrintF
 	
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt
index 4550194a..a8aabff2 100644
--- a/DRV/PIC.DRV.S.txt
+++ b/DRV/PIC.DRV.S.txt
@@ -34,7 +34,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA ARGS
 				>LDYA L.MSG.DETECT
-				>SYSCALL printf
+				>SYSCALL PrintF
 				stz ZPTmpPtr1
 				lda #$C1
 				sta ZPTmpPtr1+1
@@ -57,7 +57,7 @@ Dev.Detect		>STYA ARGS
 				cmp #$C8
 				bne .1	
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				lda #MLI.E.NODEV		Not Found in any slot, exiting
 				sec
@@ -80,7 +80,7 @@ Dev.Detect		>STYA ARGS
 
 				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL printf
+				>SYSCALL PrintF
 				clc
 				rts
 *--------------------------------------
diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt
index c572d033..066682b6 100644
--- a/DRV/UTHERNET.DRV.S.txt
+++ b/DRV/UTHERNET.DRV.S.txt
@@ -46,7 +46,7 @@ L.MAC5			.DA DCB+S.DCB.NIC.MAC+5
 *--------------------------------------
 Dev.Detect		>STYA ARGS
 				>LDYA L.MSG.DETECT
-				>SYSCALL puts
+				>SYSCALL PutS
 				ldx #$70
 				ldy #7
 
@@ -71,7 +71,7 @@ Dev.Detect		>STYA ARGS
 				dey
 				bne .1
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #MLI.E.NODEV
 				sec
@@ -92,7 +92,7 @@ Dev.Detect		>STYA ARGS
 .8				>PUSHW L.MSG.DETECT.OK
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/DRV/X.SSC.DRV.S.txt b/DRV/X.SSC.DRV.S.txt
index 3060c86f..a203d79c 100644
--- a/DRV/X.SSC.DRV.S.txt
+++ b/DRV/X.SSC.DRV.S.txt
@@ -50,7 +50,7 @@ L.DCB.STOP		.DA DCB+S.DCB.COM.STOP
 Dev.Detect		>STYA ARGS
 
 				>LDYA L.MSG.DETECT
-				>SYSCALL puts
+				>SYSCALL PutS
 				stz ZPArgPtr
 				lda #$C1
 				sta ZPArgPtr+1
@@ -74,7 +74,7 @@ Dev.Detect		>STYA ARGS
 				cmp #$C8
 				bne .1	
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #MLI.E.NODEV		Not Found in any slot, exiting
 				sec
@@ -100,7 +100,7 @@ Dev.Detect		>STYA ARGS
 .8				>PUSHW L.MSG.DETECT.OK
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
@@ -124,12 +124,12 @@ Dev.ParseArgs	>LDYA ARGS
 .1				stz ZPhParity
 				stz ZPhControl
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .2
 				>STYA ZPParityPtr
 				stx ZPhParity
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 .2				bcs .90
 				>STYA ZPControlPtr
 				stx ZPhControl
@@ -148,11 +148,11 @@ Dev.ParseArgs	>LDYA ARGS
 				bcs .90
 .90				lda ZPhControl
 				beq .91
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .91				lda ZPhParity
 				beq .92
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .92				lda #E.SYN
 				sec
diff --git a/DRV/X.U2.DRV.S.txt b/DRV/X.U2.DRV.S.txt
index df6e80ae..b2ac4677 100644
--- a/DRV/X.U2.DRV.S.txt
+++ b/DRV/X.U2.DRV.S.txt
@@ -44,7 +44,7 @@ L.MAC5			.DA DCB+S.DCB.NIC.MAC+5
 Dev.Detect		>STYA ARGS
 
 				>LDYA L.MSG.DETECT
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				ldx #$70+$88
 				ldy #7
@@ -88,7 +88,7 @@ Dev.Detect		>STYA ARGS
 				bne .1
 
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #MLI.E.NODEV
 				sec
@@ -106,7 +106,7 @@ Dev.Detect		>STYA ARGS
 				>PUSHW L.MSG.DETECT.OK
 				>PUSHW L.FD.DEV.NAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHWI DRV.END
 				>PUSHWI DRV.CS.END-DRV.CS.START
diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt
index 6ba0b9a3..1400c441 100644
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@@ -26,7 +26,7 @@ ZPLIB			.EQ	$40					32 bytes
 CORE.PSIndex	.EQ $D0
 CORE.PSCount	.EQ $D1
 
-pPs				.EQ $D2
+pPS				.EQ $D2
 pEvent			.EQ $D4
 *				.EQ $D6
 *--------------------------------------
diff --git a/INC/MACROS.I.txt b/INC/MACROS.I.txt
index 85d46426..cf1b9757 100644
--- a/INC/MACROS.I.txt
+++ b/INC/MACROS.I.txt
@@ -158,7 +158,7 @@ FPU.FOUT		.EQ 58					PrintF
 *--------------------------------------
 				.MA FPU
 				ldx #FPU.]1
-				jsr A2osX.FpuCall
+				jsr A2osX.FPUCALL
 				.EM
 *--------------------------------------
 * Global DATA Segment Access
diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt
index 9ffb9d58..7449fbfb 100644
--- a/LIB/LIBPAK.S.txt
+++ b/LIB/LIBPAK.S.txt
@@ -635,7 +635,7 @@ Pak.PrintStats	lda Pak.BL.OfsBitsL
 				
 				>PUSHBI 23
 				>LDYA L.MSG.Stats
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				ldx #TOP.MAX-1
 				
@@ -647,7 +647,7 @@ Pak.PrintStats	lda Pak.BL.OfsBitsL
 				
 				>PUSHBI TOP.MAX+1
 				>LDYA L.MSG.TopBytes
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				bit Pak.bPass2
 				bpl .9
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index 2b1e3668..01f84099 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -579,7 +579,7 @@ DEBUG.IPID		ldy #S.IP.IDENTIFICATION
 				>PUSHA
 				>PUSHBI 2
 				>LDYA L.MSG.IPID
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 				.FIN
 *--------------------------------------
diff --git a/SBIN/CIFSD.S.txt b/SBIN/CIFSD.S.txt
index 8198ecd4..2d430447 100644
--- a/SBIN/CIFSD.S.txt
+++ b/SBIN/CIFSD.S.txt
@@ -82,14 +82,14 @@ CS.RUN			jsr CS.RUN.CheckArgs
 				sec
 .9				rts
 .90				>LDYA L.MSG.USAGE
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
 *--------------------------------------
 CS.RUN.CheckArgs
 				ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #3
 				bcc .9
 
@@ -109,7 +109,7 @@ CS.RUN.CheckArgs
 				>PUSHYA
 				>PUSHBI 2
 				>LDYA L.MSG.UNKNOWN
-				>SYSCALL printf
+				>SYSCALL PrintF
 				sec
 .9				rts
 .2				lda #AF.INET
diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt
index e11d979c..9e8d160b 100644
--- a/SBIN/GETTY.S.txt
+++ b/SBIN/GETTY.S.txt
@@ -61,7 +61,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #2
 
 				bcc .9
@@ -93,7 +93,7 @@ CS.RUN			ldy #S.PS.ARGC
 
 .9				>PUSHW L.MSG.USAGE
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec
 .99				rts
@@ -105,7 +105,7 @@ CS.RUN			ldy #S.PS.ARGC
 				beq .9
 
 				ldy #S.PS.hStdErr
-				lda (pPs),y
+				lda (pPS),y
 				sta hErr
 				
 				lda ArgDev
@@ -119,11 +119,11 @@ CS.RUN			ldy #S.PS.ARGC
 				bcs .99
 
 				ldy #S.PS.hStdIn
-				sta (pPs),y
+				sta (pPS),y
 				iny						#S.PS.hStdOut
-				sta (pPs),y
+				sta (pPS),y
 				iny						#S.PS.hStdErr
-				sta (pPs),y
+				sta (pPS),y
 				sta hFILE
 
 CS.RUN.LOOP0 	>SLEEP
@@ -134,7 +134,7 @@ CS.RUN.LOOP0 	>SLEEP
 .1				>PUSHWI TELNETOPTS.LEN
 				>PUSHW L.TELNETOPTS
 				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 				bcs CS.RUN.EXIT			I/O error
 
@@ -212,7 +212,7 @@ CS.RUN.IAC.CMD	cmp #WILL
 				>PUSHW L.TELNETOPT.LMODE
 
 .7				ldy #S.PS.hStdOut
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL fwrite
 .8				jmp CS.RUN.LOOP1
 *--------------------------------------
@@ -260,7 +260,7 @@ CS.RUN.GREETINGS
 				>SYSCALL ArgV
 				>PUSHYA
 				>PUSHBI 4
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.DOEVENT		lda (pEvent)
@@ -275,7 +275,7 @@ CS.DOEVENT		lda (pEvent)
 CS.QUIT			lda hFILE
 				beq .8
 
-				>SYSCALL fclose
+				>SYSCALL FClose
 .8				clc
 				rts
 *--------------------------------------
diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt
index bac3beef..be4a2fa1 100644
--- a/SBIN/HTTPD.S.txt
+++ b/SBIN/HTTPD.S.txt
@@ -75,7 +75,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 .9				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG.TCPWAIT
-				>SYSCALL puts
+				>SYSCALL PutS
 
 				lda #TIMEOUT.MAX
 				sta TimeOut
@@ -92,7 +92,7 @@ CS.RUN			>LDYA L.MSG.TCPWAIT
 				bcs .99
 
 				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL feof
 				bcs CS.RUN.RTS			I/O err
 				tay
@@ -108,7 +108,7 @@ CS.RUN			>LDYA L.MSG.TCPWAIT
 				rts
 
 .99				>LDYA L.MSG.TCPIPERR
-				>SYSCALL puts
+				>SYSCALL PutS
 CS.RUN.SYN
 				lda #E.SYN
 				sec	
@@ -162,7 +162,7 @@ CS.RUN.ARGSOK	>PUSHBI 0				no protocol
 				bcs CS.RUN.ERR
 
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.RUN.ERR
 				
 				>STYA ZPStrPtr
@@ -173,7 +173,7 @@ CS.RUN.ARGSOK	>PUSHBI 0				no protocol
 				>PUSHW ZPRootDirPtr
 				>PUSHBI 4 
 				
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 CS.RUN.LOOP		>SLEEP
 				jsr CS.RUN.SERVER
@@ -181,7 +181,7 @@ CS.RUN.LOOP		>SLEEP
 				bra CS.RUN.LOOP
 
 .9				>LDYA L.MSG.SKTERR
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec	
 CS.RUN.ERR		rts
@@ -207,7 +207,7 @@ CS.RUN.SERVER	lda hSrvSocket
 				bpl .1
 
 				>PUSHBI 5
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				jsr CS.RUN.CLIENT
 .8				clc
@@ -237,7 +237,7 @@ CS.RUN.CLIENT
 				bra .3
 
 				lda hMsg
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .7				>PUSHWI HTTP.200OK.len
 				>PUSHW L.HTTP.200OK
@@ -251,7 +251,7 @@ CS.RUN.CLIENT
 				rts
 *--------------------------------------
 CS.RUN.MSG.INIT	sta hMsg
-				>SYSCALL getmemptr
+				>SYSCALL GetMemptr
 				>STYA ZPMsgPtr
 				pha
 				tya
diff --git a/SBIN/INITD.S.txt b/SBIN/INITD.S.txt
index f27b7d99..81e8e75b 100644
--- a/SBIN/INITD.S.txt
+++ b/SBIN/INITD.S.txt
@@ -70,7 +70,7 @@ CS.RUN			ldy #S.PS.PID
 				bne .1
 
 				>LDYA L.MSG.CTRLR
-				>SYSCALL puts
+				>SYSCALL PutS
 				
 				>LDYA L.BINSH
 				jsr CS.RUN.EXEC.YA
@@ -109,7 +109,7 @@ CS.RUN			ldy #S.PS.PID
 .99				rts
 *--------------------------------------
 CS.RUN.ETCINIT	>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				>STYA BufPtr
 				stx hBuf
 				
@@ -143,10 +143,10 @@ CS.RUN.ETCINIT	>LDYAI 256
 				rts	
 				
 .80				lda hFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				
 .81				lda hBuf
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 				rts
 *--------------------------------------
diff --git a/SBIN/INSDRV.S.txt b/SBIN/INSDRV.S.txt
index 61f0e089..f022712e 100644
--- a/SBIN/INSDRV.S.txt
+++ b/SBIN/INSDRV.S.txt
@@ -37,7 +37,7 @@ L.MSG.LOAD		.DA MSG.LOAD
 				.DA 0
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
-				lda (pPs),y
+				lda (pPS),y
 				cmp #1
 				bcc .9
 				
@@ -48,7 +48,7 @@ CS.RUN			ldy #S.PS.ARGC
 				>PUSHYA
 
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bcs .99
 				
 				lda #1					get PTR to ARG[1] (Driver name)
@@ -62,7 +62,7 @@ CS.RUN			ldy #S.PS.ARGC
 				rts
 
 .9				>LDYA L.MSG.USAGE
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #E.SYN			tell TSKMGR that all done ok, but
 				sec						we do not want to stay in memory
 .99				rts
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index 9c072eb6..cddb6ac7 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -74,7 +74,7 @@ CS.INIT			clc
 CS.INIT.RTS		rts
 *--------------------------------------
 CS.RUN			>LDYAI 33				Enough for HASH
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.INIT.RTS
 
 				>STYA ZPGetLinePtr
@@ -141,7 +141,7 @@ CS.RUN.AUTH		lda #3
 				jmp CS.RUN.EXEC
 
 .8				>LDYA L.MSG.BAD
-				>SYSCALL puts
+				>SYSCALL PutS
 				bcs .9
 
 				dec ZPRetryCnt
@@ -171,7 +171,7 @@ CS.RUN.SetUserSession
 				txa
 				tay
 				lda #0
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .9
 
 				>STYA ZPStrPtr
@@ -213,7 +213,7 @@ CS.RUN.CHECKPWD	rol ZPbValidUser
 				bcs CS.RUN.CHECK.9
 
 				>LDYAI S.PW
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs CS.RUN.CHECK.9
 
 				>STYA ZPPWPtr
@@ -290,7 +290,7 @@ CS.RUN.EXEC		ldx #1
 				lda S.Table.hSession-1,x
 				stz S.Table.hSession-1,x
 				stz S.Table.hFILE-1,x
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				
 				ldy #S.PS.hSID
 				lda ZPOldSID
@@ -387,7 +387,7 @@ CS.RUN.GetLine	sta ZPGetLineMax
 *--------------------------------------
 CS.RUN.StrOut	>PUSHYA
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.DumpFile	>PUSHYA
@@ -399,7 +399,7 @@ CS.RUN.DumpFile	>PUSHYA
 
 				stx ZPhFile		
 				>LDYAI 256
-				>SYSCALL getmem
+				>SYSCALL GetMem
 				bcs .99
 
 				>STYA ZPBufPtr
@@ -424,16 +424,16 @@ CS.RUN.DumpFile	>PUSHYA
 .9				rts
 
 .2				phx
-				>SYSCALL puts
+				>SYSCALL PutS
 				pla
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				bra .1
 
 .7 				lda ZPhBuf
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .8				lda ZPhFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 				rts
 *--------------------------------------
 CS.DOEVENT		
@@ -445,13 +445,13 @@ CS.CLEANUP		lda ZPhGetLine
 				beq CS.CLEANUP.hPW
 
 				stz ZPhGetLine
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 CS.CLEANUP.hPW	lda ZPhPW
 				beq .8
 				
 				stz ZPhPW
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 
 .8				clc
 				rts
diff --git a/SBIN/NETWORKD.S.txt b/SBIN/NETWORKD.S.txt
index 42b8d428..6b59df02 100644
--- a/SBIN/NETWORKD.S.txt
+++ b/SBIN/NETWORKD.S.txt
@@ -70,7 +70,7 @@ CS.INIT			lda DevID
 .9				rts
 
 .99				>LDYA L.MSG.RUNNING
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #0
 				sec
 				rts
@@ -86,7 +86,7 @@ CS.INIT.DEV		>PUSHBI 0
 				bne CS.INIT.DEV
 
 				>LDYA L.MSG.DEV.KO
-				>SYSCALL puts
+				>SYSCALL PutS
 				lda #MLI.E.NODEV
 				sec
 				rts
@@ -96,7 +96,7 @@ CS.INIT.DEV		>PUSHBI 0
 				>PUSHW L.MSG.DEV.OK
 				>PUSHW L.DEVNAME
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>LDYA L.DCB.NIC
 				>STYA IOCTL+S.IOCTL.BUFPTR
@@ -122,7 +122,7 @@ CS.INIT.LIBS	lda LibCnt
 				pha
 				>PUSHYA
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				pla
 				ply
@@ -204,7 +204,7 @@ CS.INIT.CONF	>LDYAI 64
 				>PUSHW L.MSG.EXEC
 				>PUSHW pBuf
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHW pBuf
 				>PUSHBI 0				S.PS.F.HOLD+S.PS.F.NOHUP
@@ -218,7 +218,7 @@ CS.INIT.CONF	>LDYAI 64
 				rts
 
 .80				lda hNetworkFile
-				>SYSCALL fclose
+				>SYSCALL FClose
 
 .81				lda hLineBuf
 				>SYSCALL FreeMem
@@ -251,7 +251,7 @@ CS.RUN			>PUSHW L.IOCTL
 				bra .1
 
 .2				lda hFrameIn
-				>SYSCALL freemem
+				>SYSCALL FreeMem
 				bra CS.RUN
 
 .8				clc
diff --git a/SBIN/NFSD.S.txt b/SBIN/NFSD.S.txt
index cb0f2646..9946ad8d 100644
--- a/SBIN/NFSD.S.txt
+++ b/SBIN/NFSD.S.txt
@@ -49,16 +49,16 @@ CS.INIT			>LDYA L.LIBTCPIP
 				>SYSCALL LoadLibYA
 				sta hLIBTCPIP
 
-				lda (pPs)
+				lda (pPS)
 				ora #S.PS.F.EVENT		Now accept events
-				sta (pPs)
+				sta (pPS)
 				clc
 				rts
 *--------------------------------------
 CS.RUN			jsr Init.Timeout
 
 				>LDYA L.MSG.TCPWAIT
-				>SYSCALL printf
+				>SYSCALL PrintF
 .1				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				bcs .99
 				>STYA ZPIPCfgPtr
@@ -68,7 +68,7 @@ CS.RUN			jsr Init.Timeout
 				jsr Wait.Timeout
 				bcc .1
 .99				>LDYA L.MSG.TCPIPERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec	
 				rts
@@ -85,7 +85,7 @@ CS.RUN.INIT		ldx #3
 
 				>STA.G hSocket
 				>LDYA L.MSG.INITOK
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .11				>SLEEP
 				ldy #bCTRLC
@@ -105,15 +105,15 @@ CS.RUN.INIT		ldx #3
 				dex
 				bpl .2
 				>LDYA L.MSG.INCOMING
-				>SYSCALL printf
+				>SYSCALL PrintF
 				bra .11
 .9				>LDYA L.MSG.SKTERR
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #E.SYN
 				sec	
 				rts
 .99				>LDYA L.MSG.ABORT
-				>SYSCALL printf
+				>SYSCALL PrintF
 				lda #0
 				sec	
 				rts
diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt
index d13a5882..62844801 100644
--- a/SBIN/TELNETD.S.txt
+++ b/SBIN/TELNETD.S.txt
@@ -66,7 +66,7 @@ CS.RUN			lda #TIMEOUT.MAX
 				sta TimeOut
 
 				>LDYA L.MSG.TCPWAIT
-				>SYSCALL puts
+				>SYSCALL PutS
 
 .1				>SLEEP
 				>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
@@ -81,7 +81,7 @@ CS.RUN			lda #TIMEOUT.MAX
 				beq .99
 
 				ldy #S.PS.hStdIn
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL feof
 				bcs .9					I/O err
 
@@ -98,7 +98,7 @@ CS.RUN			lda #TIMEOUT.MAX
 
 .99				pha
 				>LDYA L.MSG.TCPIPERR
-				>SYSCALL puts
+				>SYSCALL PutS
 				pla
 				sec	
 .9				rts
@@ -135,7 +135,7 @@ CS.RUN.PORTOK	>PUSHBI 0				no protocol
 				bcs .9
 
 				>LDYA L.MSG.INITOK
-				>SYSCALL puts
+				>SYSCALL PutS
 
 .2				>SLEEP
 
@@ -153,7 +153,7 @@ CS.RUN.PORTOK	>PUSHBI 0				no protocol
 
 .9				pha
 				>LDYA L.MSG.SKTERR
-				>SYSCALL puts
+				>SYSCALL PutS
 				pla
 				sec	
 				rts
@@ -177,7 +177,7 @@ CS.RUN.CLIENT	>SLEEP					give some time for TCPIP SYN/ACK
 				bpl .1
 
 				>PUSHBI 5
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 				>PUSHEA.G NodBuf
 				>PUSHW L.NOD.Template
@@ -207,7 +207,7 @@ CS.RUN.CLIENT1	>PUSHB hClientSocket
 				pla
 				>PUSHA
 				>PUSHBI 1
-				>SYSCALL printf
+				>SYSCALL PrintF
 
 .8				clc
 .9				rts
diff --git a/SYS/KERNEL.S.ARG.txt b/SYS/KERNEL.S.ARG.txt
index bdcdca61..46e8cb6e 100644
--- a/SYS/KERNEL.S.ARG.txt
+++ b/SYS/KERNEL.S.ARG.txt
@@ -54,7 +54,7 @@ K.Shift			jsr K.ArgV
 *\--------------------------------------
 K.ArgV			tax						save requested arg#
 				ldy #S.PS.hARGV
-				lda (pPs),y
+				lda (pPS),y
 				jsr K.GetMemPtr
 
 				>STYA ZPPtr2			Use Ptr2, called from ExpandStr
diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt
index cc53f0c9..41a804ce 100644
--- a/SYS/KERNEL.S.CORE.txt
+++ b/SYS/KERNEL.S.CORE.txt
@@ -8,18 +8,18 @@ CORE.Run		stz CORE.PSIndex
 				beq .8
 				jsr K.GetMemPtr
 				>STYA pPs
-				lda (pPs)				get S.PS.F 
+				lda (pPS)				get S.PS.F 
 *				bit #S.PS.F.HOLD		Waiting for Another Task to Terminate?
 *				beq .2
 
 				bpl .2
 				ldy #S.PS.CPID
-				lda (pPs),y
+				lda (pPS),y
 				jsr CORE.GetPS
 				bcc .8					yes, still running....
-				lda (pPs)				get S.PS.F again
+				lda (pPS)				get S.PS.F again
 				eor #S.PS.F.HOLD		unmark as HOLD
-				sta (pPs)
+				sta (pPS)
 .2				jsr CORE.PSSelect		Restore ZP & Ptrs
 
 .3				jsr CORE.PSExec			INIT/RUN/QUIT/RESUME
@@ -29,22 +29,22 @@ CORE.Run		stz CORE.PSIndex
 				jsr CORE.UpdateParentPS
 				ldy #S.PS.S
 				lda #S.PS.S.QUIT
-				sta (pPs),y
+				sta (pPS),y
 				bra .3					try executing QUIT now...
-.4				lda (pPs)
+.4				lda (pPS)
 				bit #S.PS.F.SLEEP
 				bne .7
 				ldy #S.PS.S
-				lda (pPs),y
+				lda (pPS),y
 				bne .5
 				lda #S.PS.S.RUN			go from INIT to RUN
-				sta (pPs),y
+				sta (pPS),y
 				bra .7
 .5				cmp #S.PS.S.QUIT
 				bne .7			
 				>PUSHBI 2
 				ldy #S.PS.PID
-				lda (pPs),y
+				lda (pPS),y
 				>SYSCALL2 Kill
 				bra .8
 .7				jsr CORE.PSLeave		Save ZP & Ptrs
@@ -106,7 +106,7 @@ CORE.UpdateParentPS
 				tax						save RC From INIT or RUN
 
 				ldy #S.PS.PPID			Notify Parent Process for exit code...
-				lda (pPs),y
+				lda (pPS),y
 				beq .8					no parent process
 				jsr CORE.GetPSByID		X unmodified
 				bcs .8					parent is dead.....skipping...
@@ -119,7 +119,7 @@ CORE.UpdateParentPS
 				ldy #S.PS.CPID
 				lda (ZPPtr1),y
 				dey						#S.PS.PID
-				cmp (pPs),y
+				cmp (pPS),y
 				bne .8					Hold, but not waiting this PS
 				txa						waiting for this PS to terminate....
 				ldy #S.PS.RC			give it RC
@@ -215,17 +215,17 @@ CORE.Dispatch	stz CORE.PSIndex
 				jsr K.GetMemPtr
 				>STYA pPS
 			
-				lda (pPs)
+				lda (pPS)
 				bit #S.PS.F.EVENT		Accept Events ?
 				beq .5
 
 				ldy #S.PS.S
-				lda (pPs),y
+				lda (pPS),y
 				cmp #S.PS.S.RUN
 				bne .5
 
 				lda #S.PS.S.DOEVENT		Flag this PS for IRQ Mgr
-				sta (pPs),y
+				sta (pPS),y
 				jsr CORE.PSSelect
 
 				lda #Evt.Table
@@ -254,7 +254,7 @@ CORE.Dispatch	stz CORE.PSIndex
 
 .4				ldy #S.PS.S
 				lda #S.PS.S.RUN
-				sta (pPs),y
+				sta (pPS),y
 				jsr CORE.PSLeave
 .5				inc CORE.PSIndex
 				ldx CORE.PSIndex
@@ -321,7 +321,7 @@ CORE.DestroyEvent
 CORE.PSSelect	ldy #S.PS.ZP.CODE+PSCTX.SIZE-1
 				ldx #PSCTX.SIZE-1
 
-.1				lda (pPs),y
+.1				lda (pPS),y
 				sta pCode,x
 				dey
 				dex
@@ -333,7 +333,7 @@ CORE.PSLeave	ldx #PSCTX.SIZE-1
 				ldy #S.PS.ZP.CODE+PSCTX.SIZE-1
 				
 .1				lda pCode,x
-				sta (pPs),y
+				sta (pPS),y
 				dey
 				dex
 				bpl .1
@@ -372,22 +372,22 @@ CORE.PSResume	sei
 				inx
 				bne .1
 .2				ldy #S.PS.PC+1
-				lda (pPs),y
+				lda (pPS),y
 				pha
 				dey						#S.PS.PC
-				lda (pPs),y
+				lda (pPS),y
 				pha
 				dey						#S.PS.P
-				lda (pPs),y
+				lda (pPS),y
 				pha
 				dey						#S.PS.Y
-				lda (pPs),y
+				lda (pPS),y
 				pha
 				dey						#S.PS.X
-				lda (pPs),y
+				lda (pPS),y
 				tax
 				dey						#S.PS.A
-				lda (pPs),y
+				lda (pPS),y
 
 				ply
 				inc IRQ.InKernel
diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt
index 14f8be32..c3f05a5d 100644
--- a/SYS/KERNEL.S.ENV.txt
+++ b/SYS/KERNEL.S.ENV.txt
@@ -17,7 +17,7 @@ K.SetEnv
 *				>PULLW TXTPTR			name
 				
 *				ldy #S.PS.hENV
-*				lda (pPs),y
+*				lda (pPS),y
 
 *				jmp K.SYSCALL.JMPX
 */--------------------------------------
@@ -39,7 +39,7 @@ K.GetEnv		>PULLW FORPNT			value
 *				>PULLW TXTPTR			name
 *				
 *				ldy #S.PS.hENV
-*				lda (pPs),y
+*				lda (pPS),y
 				
 *				jmp K.SYSCALL.JMPX
 */--------------------------------------
@@ -69,7 +69,7 @@ K.UnsetEnv
 *				>PULLW TXTPTR			name
 
 				ldy #S.PS.hENV
-				lda (pPs),y
+				lda (pPS),y
 				
 				jmp K.SYSCALL.JMPX
 *--------------------------------------
diff --git a/SYS/KERNEL.S.ENVX.txt b/SYS/KERNEL.S.ENVX.txt
index cb73eb51..cda611c3 100644
--- a/SYS/KERNEL.S.ENVX.txt
+++ b/SYS/KERNEL.S.ENVX.txt
@@ -85,7 +85,7 @@ ENVX.SetEnv		jsr ENVX.UnsetEnv
 				txa
 				sta CLRWRITEAUX
 				ldy #S.PS.hENV
-				lda (pPs),y
+				lda (pPS),y
 				sta SETWRITEAUX
 				bra .1				Start over
 
diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt
index 0ca8c5bc..ac7a81aa 100644
--- a/SYS/KERNEL.S.GP.txt
+++ b/SYS/KERNEL.S.GP.txt
@@ -46,19 +46,19 @@ GP.Sleep		php
 
 				phy
 				ldy #S.PS.A
-				sta (pPs),y
+				sta (pPS),y
 
 				txa
 				iny						#S.PS.X
-				sta (pPs),y
+				sta (pPS),y
 
 				pla
 				iny						#S.PS.Y
-				sta (pPs),y
+				sta (pPS),y
 
 				pla
 				iny						#S.PS.P
-				sta (pPs),y
+				sta (pPS),y
 
 				pla						get PC LO
 				plx						get PC HI
@@ -68,11 +68,11 @@ GP.Sleep		php
 				inx
 
 GP.Sleep2		ldy #S.PS.PC
-				sta (pPs),y
+				sta (pPS),y
 
 				txa
 				iny						#S.PS.PC+1
-				sta (pPs),y
+				sta (pPS),y
 
 				tsx
 
@@ -98,9 +98,9 @@ GP.Sleep2		ldy #S.PS.PC
 				inc $1fe				PC=PC+1
 				bne .4
 				inc $1ff				because of RTI
-.4				lda (pPs)
+.4				lda (pPS)
 				ora #S.PS.F.SLEEP
-				sta (pPs)
+				sta (pPS)
 				lda #0					cld,clc,cli
 				pha
 				rti						exit to kernel with CC
@@ -112,13 +112,13 @@ GP.SysCall		dec IRQ.InKernel
 				pha
 				phy
 				ldy #S.PS.A
-				sta (pPs),y
+				sta (pPS),y
 				txa
 				iny						#S.PS.X
-				sta (pPs),y
+				sta (pPS),y
 				pla
 				iny						#S.PS.Y
-				sta (pPs),y
+				sta (pPS),y
 				tay
 				pla
 				jsr K.SYSCALL2
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index 6128159a..7227d94b 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -123,11 +123,11 @@ Kernel.Init3	sta SETALTZP
 				bcs *
 	
 				ldy #S.PS.hStdIn
-				sta (pPs),y
+				sta (pPS),y
 				iny						#S.PS.hStdOut
-				sta (pPs),y
+				sta (pPS),y
 				iny						#S.PS.hStdErr
-				sta (pPs),y
+				sta (pPS),y
 *--------------------------------------
 Kernel.Init3C	>PUSHWI MSG.Init3
 				>PUSHBI 0
@@ -154,7 +154,7 @@ Kernel.Init3C	>PUSHWI MSG.Init3
 				>PUSHWI MSG.EXEC
 				>PUSHWI SBININITD
 				>PUSHBI 2
-				>SYSCALL printf
+				>SYSCALL PrintF
 				
 				>PUSHWI SBININITD
 				>PUSHBI 0				PS Flags
@@ -999,7 +999,7 @@ TskMgrInit		>LDYAI MSG.TSK
 				txa
 
 				ldy	#S.PS.hENV
-				sta (pPs),y
+				sta (pPS),y
 				
 				sta SETWRITEAUX
 				lda #0
@@ -1013,7 +1013,7 @@ TskMgrInit		>LDYAI MSG.TSK
 
 				txa
 				ldy #S.PS.hCWD
-				sta (pPs),y
+				sta (pPS),y
 
 				>PUSHWI I.ENV.BOOT
 				>PUSHWI $2C0			Get BOOT from QC
diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt
index bdcb6823..6508db14 100644
--- a/SYS/KERNEL.S.IRQ.txt
+++ b/SYS/KERNEL.S.IRQ.txt
@@ -190,7 +190,7 @@ K.IrqH.Switch	inc IRQ.Tick
 				bvc .8
 
 				ldy #S.PS.S
-				lda (pPs),y
+				lda (pPS),y
 				eor #S.PS.S.RUN
 				bne .9
 				lda IRQ.InLib
diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt
index 2b66aa59..aa87cff1 100644
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@@ -221,7 +221,7 @@ MEM.GetMem.YAX	stx MEM.ReqFlags
 				ldy #S.MEM.REFCNT
 				sta (ZPMemMgrSPtr),y
 				ldy #S.PS.PID
-				lda (pPs),y
+				lda (pPS),y
 				ldy #S.MEM.OWNERPID
 				sta (ZPMemMgrSPtr),y
 				clc
diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt
index a9101670..11307d69 100644
--- a/SYS/KERNEL.S.STDIO.txt
+++ b/SYS/KERNEL.S.STDIO.txt
@@ -15,7 +15,7 @@ NEW
 K.PutChar		>PUSHA					character
 
 				ldy #S.PS.hStdOut
-				lda	(pPs),y
+				lda	(pPS),y
 				jsr K.FPutC
 				bcc K.PutChar.RTS
 
@@ -68,7 +68,7 @@ K.FPutC			jsr PFT.CheckNodeA
 * **In:**
 * ## ASM
 * `>LDYAI str`
-* `>SYSCALL puts`
+* `>SYSCALL PutS`
 * ## RETURN VALUE 
 * CC = success
 *\--------------------------------------
@@ -103,7 +103,7 @@ K.PutS			>STYA ZPPtr2
 				>PUSHWI K.IOBuf
 
 				ldy #S.PS.hStdOut
-				lda	(pPs),y
+				lda	(pPS),y
 				jsr K.FPutS
 				bcc K.PutS.RTS
 				tay
@@ -275,7 +275,7 @@ K.FGetS			jsr PFT.CheckNodeA
 *   A = char
 *\--------------------------------------
 K.GetChar		ldy #S.PS.hStdIn
-				lda	(pPs),y		
+				lda	(pPS),y		
 */--------------------------------------
 * # getc (BLOCKING)
 * Get char from Node
@@ -367,7 +367,7 @@ K.FOpen.RET4	>RET 4
 * ## ASM
 * **In:**
 * `lda stream`
-* `>SYSCALL fclose`
+* `>SYSCALL FClose`
 * ## RETURN VALUE
 *\--------------------------------------
 K.FClose		jsr PFT.CheckNodeA
diff --git a/SYS/KERNEL.S.STDIO2.S.txt b/SYS/KERNEL.S.STDIO2.S.txt
index 42957f44..22e08738 100644
--- a/SYS/KERNEL.S.STDIO2.S.txt
+++ b/SYS/KERNEL.S.STDIO2.S.txt
@@ -16,7 +16,7 @@ NEW
 * `>PUSHW i`
 * `...`
 * `>PUSHBI 2`	#bytecount
-* `>SYSCALL printf`
+* `>SYSCALL PrintF`
 * FPrintF : 
 * `>PUSHB hFILE`
 * `>PUSHW format`
@@ -76,7 +76,7 @@ K.PrintF.PadL	.EQ FAC+5
 K.PrintF.PadC	.EQ ARG.SIGN
 *--------------------------------------
 K.PrintF		ldy #S.PS.hStdOut
-				lda	(pPs),y
+				lda	(pPS),y
 				sta PrintF.hFILE
 
 				clc
@@ -442,7 +442,7 @@ PrintF.COut.RTS	rts
 * A = Number of arguments filled.
 *\--------------------------------------
 K.ScanF			ldy #S.PS.hStdIn
-				lda	(pPs),y
+				lda	(pPS),y
 				sta PrintF.hFILE
 				
 				clc
diff --git a/SYS/KERNEL.S.STDLIB.txt b/SYS/KERNEL.S.STDLIB.txt
index 38539026..e3ee212e 100644
--- a/SYS/KERNEL.S.STDLIB.txt
+++ b/SYS/KERNEL.S.STDLIB.txt
@@ -172,7 +172,7 @@ K.realpath		ldy #3
 				beq .3					yes, do not append to current prefix
 
 .1				ldy #S.PS.hCWD
-				lda (pPs),y
+				lda (pPS),y
 				jsr K.GetMemPtr
 				>STYA .20+1
 
@@ -399,7 +399,7 @@ K.Expand		ldy #2
 				>STYA FORPNT
 
 				ldy #S.PS.hENV
-				lda (pPs),y
+				lda (pPS),y
 				
 				ldx #SYS.GetEnv
 				jsr K.SYSCALL.JMPX