From 59155c44819b880355c2e3dc1f6980663bdd6663 Mon Sep 17 00:00:00 2001
From: Fellippe Heitor <fellippeheitor@gmail.com>
Date: Sun, 31 Jan 2021 03:44:38 -0300
Subject: [PATCH] Adds the ability to have CamelCase for internal keywords.

---
 source/global/IDEsettings.bas            |  15 +-
 source/ide/ide_methods.bas               |  51 +-
 source/qb64.bas                          | 460 +++++++-----
 source/subs_functions/subs_functions.bas | 848 +++++++++++------------
 4 files changed, 745 insertions(+), 629 deletions(-)

diff --git a/source/global/IDEsettings.bas b/source/global/IDEsettings.bas
index d552752d3..e702454ba 100644
--- a/source/global/IDEsettings.bas
+++ b/source/global/IDEsettings.bas
@@ -15,7 +15,7 @@ DIM SHARED IDEShowErrorsImmediately AS _BYTE
 DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
 DIM SHARED IgnoreWarnings AS _BYTE, qb64versionprinted AS _BYTE
 DIM SHARED DisableSyntaxHighlighter AS _BYTE, ExeToSourceFolderFirstTimeMsg AS _BYTE
-DIM SHARED WhiteListQB64FirstTimeMsg AS _BYTE
+DIM SHARED WhiteListQB64FirstTimeMsg AS _BYTE, ideautolayoutkwcapitals AS _BYTE
 
 IF LoadedIDESettings = 0 THEN
     'We only want to load the file once when QB64 first starts
@@ -235,6 +235,19 @@ IF LoadedIDESettings = 0 THEN
         idesortsubs = 0
     END IF
 
+    result = ReadConfigSetting("IDE_KeywordCapital", value$)
+    IF result THEN
+        IF value$ = "TRUE" OR VAL(value$) = -1 THEN
+            ideautolayoutkwcapitals = -1
+        ELSE
+            ideautolayoutkwcapitals = 0
+            WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
+        END IF
+    ELSE
+        WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
+        ideautolayoutkwcapitals = 0
+    END IF
+
     result = ReadConfigSetting("IDE_SUBsLength", value$)
     IF result THEN
         IF value$ = "TRUE" OR VAL(value$) = -1 THEN
diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 42d944aad..0c75a9510 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -10163,38 +10163,51 @@ FUNCTION idelayoutbox
 
     '-------- init --------
     i = 0
-    idepar p, 60, 8, "Code Layout"
+    idepar p, 60, 9, "Code Layout"
 
     i = i + 1
+    ideautolayoutid = i
     o(i).typ = 4 'check box
     o(i).y = 2
     o(i).nam = idenewtxt("#Auto Spacing & Upper/Lowercase Formatting")
     o(i).sel = ideautolayout
 
     i = i + 1
+    ideautolayoutkwcapitalsid = i
     o(i).typ = 4 'check box
-    o(i).y = 4
+    o(i).y = 3
+    o(i).x = 6
+    o(i).nam = idenewtxt("#Keywords in CAPITALS")
+    o(i).sel = ideautolayoutkwcapitals
+
+    i = i + 1
+    ideautoindentID = i
+    o(i).typ = 4 'check box
+    o(i).y = 5
     o(i).nam = idenewtxt("Auto #Indent -")
     o(i).sel = ideautoindent
 
     a2$ = str2$(ideautoindentsize)
     i = i + 1
+    ideautoindentsizeid = i
     o(i).typ = 1
     o(i).x = 20
-    o(i).y = 4
+    o(i).y = 5
     o(i).nam = idenewtxt("#Spacing")
     o(i).txt = idenewtxt(a2$)
     o(i).v1 = LEN(a2$)
 
     i = i + 1
+    ideindentsubsid = i
     o(i).typ = 4
-    o(i).y = 6
+    o(i).y = 7
     o(i).nam = idenewtxt("Indent SUBs and #FUNCTIONs")
     o(i).sel = ideindentsubs
 
     i = i + 1
+    buttonsid = i
     o(i).typ = 3
-    o(i).y = 8
+    o(i).y = 9
     o(i).txt = idenewtxt("#OK" + sep + "#Cancel")
     o(i).dft = 1
     '-------- end of init --------
@@ -10275,14 +10288,14 @@ FUNCTION idelayoutbox
         IF focus <> PrevFocus THEN
             'Always start with TextBox values selected upon getting focus
             PrevFocus = focus
-            IF focus = 3 THEN
+            IF o(focus).typ = 1 THEN
                 o(focus).v1 = LEN(idetxt(o(focus).txt))
                 IF o(focus).v1 > 0 THEN o(focus).issel = -1
                 o(focus).sx1 = 0
             END IF
         END IF
 
-        a$ = idetxt(o(3).txt)
+        a$ = idetxt(o(ideautoindentsizeid).txt)
         IF LEN(a$) > 2 THEN a$ = LEFT$(a$, 2) '2 character limit
         FOR i = 1 TO LEN(a$)
             a = ASC(a$, i)
@@ -10293,18 +10306,21 @@ FUNCTION idelayoutbox
             a = VAL(a$)
             IF a > 64 THEN a$ = "64"
         END IF
-        idetxt(o(3).txt) = a$
+        idetxt(o(ideautoindentsizeid).txt) = a$
 
-        IF K$ = CHR$(27) OR (focus = 6 AND info <> 0) THEN EXIT FUNCTION
-        IF K$ = CHR$(13) OR (focus = 5 AND info <> 0) THEN
+        IF K$ = CHR$(27) OR (focus = buttonsid + 1 AND info <> 0) THEN EXIT FUNCTION 'cancel
+        IF K$ = CHR$(13) OR (focus = buttonsid AND info <> 0) THEN 'ok
             'save changes
-            v% = o(1).sel: IF v% <> 0 THEN v% = 1 'ideautolayout
-
+            v% = o(ideautolayoutid).sel: IF v% <> 0 THEN v% = 1 'ideautolayout
             IF ideautolayout <> v% THEN ideautolayout = v%: idelayoutbox = 1
-            v% = o(2).sel: IF v% <> 0 THEN v% = 1 'ideautoindent
 
+            v% = o(ideautolayoutkwcapitalsid).sel: IF v% <> 0 THEN v% = 1 'ideautolayoutkwcapitals
+            IF ideautolayoutkwcapitals <> v% THEN ideautolayoutkwcapitals = v%: idelayoutbox = 1
+
+            v% = o(ideautoindentid).sel: IF v% <> 0 THEN v% = 1 'ideautoindent
             IF ideautoindent <> v% THEN ideautoindent = v%: idelayoutbox = 1
-            v$ = idetxt(o(3).txt) 'ideautoindentsize
+
+            v$ = idetxt(o(ideautoindentsizeid).txt) 'ideautoindentsize
             IF v$ = "" THEN v$ = "4"
             v% = VAL(v$)
             IF v% < 0 OR v% > 64 THEN v% = 4
@@ -10313,7 +10329,7 @@ FUNCTION idelayoutbox
                 IF ideautoindent <> 0 THEN idelayoutbox = 1
             END IF
 
-            v% = o(4).sel: IF v% <> 0 THEN v% = 1 'ideindentsubs
+            v% = o(ideindentsubsid).sel: IF v% <> 0 THEN v% = 1 'ideindentsubs
             IF ideindentsubs <> v% THEN ideindentsubs = v%: idelayoutbox = 1
 
             IF ideautolayout THEN
@@ -10321,6 +10337,11 @@ FUNCTION idelayoutbox
             ELSE
                 WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoFormat", "FALSE"
             END IF
+            IF ideautolayoutkwcapitals THEN
+                WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "TRUE"
+            ELSE
+                WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
+            END IF
             IF ideautoindent THEN
                 WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoIndent", "TRUE"
             ELSE
diff --git a/source/qb64.bas b/source/qb64.bas
index 89e125a5f..97e079ccc 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -1750,7 +1750,7 @@ DO
                 END SELECT
             NEXT
             r$ = r1$
-            layout$ = "$LET " + l$ + " = " + r$
+            layout$ = SCase$("$Let ") + l$ + " = " + r$
             'First look to see if we have an existing setting like this and if so, update it
             FOR i = 8 TO UserDefineCount 'UserDefineCount 1-7 are reserved for automatic OS/BIT detection & version
                 IF UserDefine(0, i) = l$ THEN UserDefine(1, i) = r$: GOTO finishedlinepp
@@ -2860,7 +2860,7 @@ DO
             IF DefineElse(ExecCounter) = 0 THEN a$ = "$END IF without $IF": GOTO errmes
             DefineElse(ExecCounter) = 0 'We no longer have an $IF block at this level
             ExecCounter = ExecCounter - 1
-            layout$ = "$END IF"
+            layout$ = SCase$("$End If")
             controltype(controllevel) = 0
             controllevel = controllevel - 1
             GOTO finishednonexec
@@ -2888,9 +2888,9 @@ DO
 
             controllevel = controllevel + 1
             controltype(controllevel) = 6
-            IF temp = 0 THEN layout$ = "$IF " + temp$ + " THEN": GOTO finishednonexec 'no = sign in the $IF statement, so we're going to assume the user is doing something like $IF flag
+            IF temp = 0 THEN layout$ = SCase$("$If ") + temp$ + SCase$(" Then"): GOTO finishednonexec 'no = sign in the $IF statement, so we're going to assume the user is doing something like $IF flag
             l$ = RTRIM$(LEFT$(temp$, temp - 1)): r$ = LTRIM$(MID$(temp$, temp + 1))
-            layout$ = "$IF " + l$ + " = " + r$ + " THEN"
+            layout$ = SCase$("$If ") + l$ + " = " + r$ + SCase$(" Then")
             GOTO finishednonexec
         END IF
 
@@ -2903,7 +2903,7 @@ DO
             ELSE
                 ExecLevel(ExecCounter) = ExecLevel(ExecCounter - 1) 'If we were processing code before, code after this segment is going to be SKIPPED
             END IF
-            layout$ = "$ELSE"
+            layout$ = SCase$("$Else")
             lhscontrollevel = lhscontrollevel - 1
             GOTO finishednonexec
         END IF
@@ -2930,9 +2930,9 @@ DO
 
                 lhscontrollevel = lhscontrollevel - 1
                 temp = INSTR(temp$, "=")
-                IF temp = 0 THEN layout$ = "$ELSEIF " + temp$ + " THEN": GOTO finishednonexec 'no = sign in the $IF statement, so we're going to assume the user is doing something like $IF flag
+                IF temp = 0 THEN layout$ = SCase$("$ElseIf ") + temp$ + SCase$(" Then"): GOTO finishednonexec 'no = sign in the $IF statement, so we're going to assume the user is doing something like $IF flag
                 l$ = RTRIM$(LEFT$(temp$, temp - 1)): r$ = LTRIM$(MID$(temp$, temp + 1))
-                layout$ = "$ELSEIF " + l$ + " = " + r$ + " THEN"
+                layout$ = SCase$("$ElseIf ") + l$ + " = " + r$ + SCase$(" Then")
                 GOTO finishednonexec
             END IF
         END IF
@@ -2948,7 +2948,7 @@ DO
             'For starters, let's make certain that we have 3 elements to deal with
             temp = INSTR(temp$, "=") 'without an = in there, we can't get a value from the left and right side
             l$ = RTRIM$(LEFT$(temp$, temp - 1)): r$ = LTRIM$(MID$(temp$, temp + 1))
-            layout$ = "$LET " + l$ + " = " + r$
+            layout$ = SCase$("$Let ") + l$ + " = " + r$
             'First look to see if we have an existing setting like this and if so, update it
             FOR i = 7 TO UserDefineCount 'UserDefineCount 1-7 are reserved for automatic OS/BIT detection & version
                 IF UserDefine(0, i) = l$ THEN UserDefine(1, i) = r$: GOTO finishednonexec
@@ -2964,14 +2964,14 @@ DO
         END IF
 
         IF a3u$ = "$COLOR:0" THEN
-            layout$ = "$COLOR:0"
+            layout$ = SCase$("$Color:0")
             addmetainclude$ = getfilepath$(COMMAND$(0)) + "source" + pathsep$ + "utilities" + pathsep$ + "color0.bi"
             layoutdone = 1
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$COLOR:32" THEN
-            layout$ = "$COLOR:32"
+            layout$ = SCase$("$Color:32")
             addmetainclude$ = getfilepath$(COMMAND$(0)) + "source" + pathsep$ + "utilities" + pathsep$ + "color32.bi"
             layoutdone = 1
             GOTO finishednonexec
@@ -2979,42 +2979,42 @@ DO
 
         IF a3u$ = "$NOPREFIX" THEN
             'already set in prepass
-            layout$ = "$NOPREFIX"
+            layout$ = SCase$("$NoPrefix")
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$VIRTUALKEYBOARD:ON" THEN
             'Deprecated; does nothing.
-            layout$ = "$VIRTUALKEYBOARD:ON"
+            layout$ = SCase$("$VirtualKeyboard:On")
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$VIRTUALKEYBOARD:OFF" THEN
             'Deprecated; does nothing.
-            layout$ = "$VIRTUALKEYBOARD:OFF"
+            layout$ = SCase$("$VirtualKeyboard:Off")
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$CHECKING:OFF" THEN
-            layout$ = "$CHECKING:OFF"
+            layout$ = SCase$("$Checking:Off")
             NoChecks = 1
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$CHECKING:ON" THEN
-            layout$ = "$CHECKING:ON"
+            layout$ = SCase$("$Checking:On")
             NoChecks = 0
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$CONSOLE" THEN
-            layout$ = "$CONSOLE"
+            layout$ = SCase$("$Console")
             Console = 1
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$CONSOLE:ONLY" THEN
-            layout$ = "$CONSOLE:ONLY"
+            layout$ = SCase$("$Console:Only")
             DEPENDENCY(DEPENDENCY_CONSOLE_ONLY) = DEPENDENCY(DEPENDENCY_CONSOLE_ONLY) OR 1
             Console = 1
             IF prepass = 0 THEN
@@ -3027,47 +3027,47 @@ DO
         END IF
 
         IF a3u$ = "$ASSERTS" THEN
-            layout$ = "$ASSERTS"
+            layout$ = SCase$("$Asserts")
             Asserts = 1
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$ASSERTS:CONSOLE" THEN
-            layout$ = "$ASSERTS:CONSOLE"
+            layout$ = SCase$("$Asserts:Console")
             Asserts = 1
             Console = 1
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$SCREENHIDE" THEN
-            layout$ = "$SCREENHIDE"
+            layout$ = SCase$("$ScreenHide")
             ScreenHide = 1
             GOTO finishednonexec
         END IF
         IF a3u$ = "$SCREENSHOW" THEN
-            layout$ = "$SCREENSHOW"
+            layout$ = SCase$("$ScreenShow")
             ScreenHide = 0
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$RESIZE:OFF" THEN
-            layout$ = "$RESIZE:OFF"
+            layout$ = SCase$("$Resize:Off")
             Resize = 0: Resize_Scale = 0
             GOTO finishednonexec
         END IF
         IF a3u$ = "$RESIZE:ON" THEN
-            layout$ = "$RESIZE:ON"
+            layout$ = SCase$("$Resize:On")
             Resize = 1: Resize_Scale = 0
             GOTO finishednonexec
         END IF
 
         IF a3u$ = "$RESIZE:STRETCH" THEN
-            layout$ = "$RESIZE:STRETCH"
+            layout$ = SCase$("$Resize:Stretch")
             Resize = 1: Resize_Scale = 1
             GOTO finishednonexec
         END IF
         IF a3u$ = "$RESIZE:SMOOTH" THEN
-            layout$ = "$RESIZE:SMOOTH"
+            layout$ = SCase$("$Resize:Smooth")
             Resize = 1: Resize_Scale = 2
             GOTO finishednonexec
         END IF
@@ -3087,44 +3087,44 @@ DO
                 CASE "FILEVERSION#"
                     GOSUB ValidateVersion
                     viFileVersionNum$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:FILEVERSION#=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:FILEVERSION#=") + VersionInfoValue$
                 CASE "PRODUCTVERSION#"
                     GOSUB ValidateVersion
                     viProductVersionNum$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:PRODUCTVERSION#=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:PRODUCTVERSION#=") + VersionInfoValue$
                 CASE "COMPANYNAME"
                     viCompanyName$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:CompanyName=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "CompanyName=" + VersionInfoValue$
                 CASE "FILEDESCRIPTION"
                     viFileDescription$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:FileDescription=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "FileDescription=" + VersionInfoValue$
                 CASE "FILEVERSION"
                     viFileVersion$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:FileVersion=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "FileVersion=" + VersionInfoValue$
                 CASE "INTERNALNAME"
                     viInternalName$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:InternalName=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "InternalName=" + VersionInfoValue$
                 CASE "LEGALCOPYRIGHT"
                     viLegalCopyright$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:LegalCopyright=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "LegalCopyright=" + VersionInfoValue$
                 CASE "LEGALTRADEMARKS"
                     viLegalTrademarks$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:LegalTrademarks=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "LegalTrademarks=" + VersionInfoValue$
                 CASE "ORIGINALFILENAME"
                     viOriginalFilename$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:OriginalFilename=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "OriginalFilename=" + VersionInfoValue$
                 CASE "PRODUCTNAME"
                     viProductName$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:ProductName=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "ProductName=" + VersionInfoValue$
                 CASE "PRODUCTVERSION"
                     viProductVersion$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:ProductVersion=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "ProductVersion=" + VersionInfoValue$
                 CASE "COMMENTS"
                     viComments$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:Comments=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "Comments=" + VersionInfoValue$
                 CASE "WEB"
                     viWeb$ = VersionInfoValue$
-                    layout$ = "$VERSIONINFO:Web=" + VersionInfoValue$
+                    layout$ = SCase$("$VersionInfo:") + "Web=" + VersionInfoValue$
                 CASE ELSE
                     a$ = "Invalid key. (Use FILEVERSION#, PRODUCTVERSION#, CompanyName, FileDescription, FileVersion, InternalName, LegalCopyright, LegalTrademarks, OriginalFilename, ProductName, ProductVersion, Comments or Web)"
                     GOTO errmes
@@ -3159,7 +3159,7 @@ DO
             END IF
             ExeIconFile$ = RTRIM$(LTRIM$(MID$(a3$, FirstDelimiter + 1, SecondDelimiter - FirstDelimiter - 1)))
             IF LEN(ExeIconFile$) = 0 THEN a$ = "Expected $EXEICON:'filename'": GOTO errmes
-            layout$ = "$EXEICON:'" + ExeIconFile$ + "'" + MID$(a3$, SecondDelimiter + 1)
+            layout$ = SCase$("$ExeIcon:'") + ExeIconFile$ + "'" + MID$(a3$, SecondDelimiter + 1)
 
             IF INSTR(_OS$, "WIN") THEN
                 'Actual metacommand processing. Windows only.
@@ -3566,7 +3566,7 @@ DO
 
     IF n <= 2 THEN
         IF firstelement$ = "DATA" THEN
-            l$ = firstelement$
+            l$ = SCase$("Data")
             IF n = 2 THEN
 
                 e$ = SPACE$((LEN(secondelement$) - 1) \ 2)
@@ -3594,7 +3594,7 @@ DO
         IF firstelement$ = "END" THEN
             IF n <> 2 OR secondelement$ <> "DECLARE" THEN a$ = "Expected END DECLARE": GOTO errmes
             declaringlibrary = 0
-            l$ = "END" + sp + "DECLARE"
+            l$ = SCase$("End" + sp + "Declare")
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             GOTO finishednonexec
         END IF 'end declare
@@ -3614,7 +3614,7 @@ DO
         IF firstelement$ = "END" THEN
             IF n <> 2 OR secondelement$ <> "TYPE" THEN a$ = "Expected END TYPE": GOTO errmes
             definingtype = 0
-            l$ = "END" + sp + "TYPE"
+            l$ = SCase$("End" + sp + "Type")
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             GOTO finishednonexec
         END IF
@@ -3622,7 +3622,7 @@ DO
         IF n < 3 THEN a$ = "Expected element-name AS type or AS type element-list": GOTO errmes
         definingtype = 2
         IF firstelement$ = "AS" THEN
-            l$ = "AS"
+            l$ = SCase$("As")
             t$ = ""
             wordsInTypeName = 0
             DO
@@ -3651,8 +3651,12 @@ DO
                 ELSE
                     t$ = RTRIM$(udtxcname(typ AND 511))
                 END IF
+                l$ = l$ + sp + t$
+            ELSE
+                l$ = l$ + sp + SCase2$(t$)
             END IF
-            l$ = l$ + sp + t$
+
+            'Now add each variable:
             FOR i = 3 + wordsInTypeName TO n
                 thisElement$ = getelement$(ca$, i)
                 IF thisElement$ = "," THEN
@@ -3663,7 +3667,7 @@ DO
             NEXT
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
         ELSE
-            l$ = getelement(ca$, 1) + sp + "AS"
+            l$ = getelement(ca$, 1) + sp + SCase$("As")
             t$ = getelements$(a$, 3, n)
             typ = typname2typ(t$)
             IF Error_Happened THEN GOTO errmes
@@ -3674,8 +3678,10 @@ DO
                 ELSE
                     t$ = RTRIM$(udtxcname(typ AND 511))
                 END IF
+                l$ = l$ + sp + t$
+            ELSE
+                l$ = l$ + sp + SCase2$(t$)
             END IF
-            l$ = l$ + sp + t$
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
         END IF
         GOTO finishednonexec
@@ -3684,7 +3690,7 @@ DO
 
     IF firstelement$ = "TYPE" THEN
         IF n <> 2 THEN a$ = "Expected TYPE type-name": GOTO errmes
-        l$ = "TYPE" + sp + getelement(ca$, 2)
+        l$ = SCase$("Type") + sp + getelement(ca$, 2)
         layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
         definingtype = 1
         definingtypeerror = linenumber
@@ -3704,13 +3710,13 @@ DO
                 staticlinkedlibrary = 0
 
                 x = 3
-                l$ = "DECLARE" + sp + "LIBRARY"
+                l$ = SCase$("Declare" + sp + "Library")
 
                 IF secondelement$ = "DYNAMIC" THEN
                     e$ = getelement$(a$, 3): IF e$ <> "LIBRARY" THEN a$ = "Expected DYNAMIC LIBRARY " + CHR$(34) + "..." + CHR$(34): GOTO errmes
                     dynamiclibrary = 1
                     x = 4
-                    l$ = "DECLARE" + sp + "DYNAMIC" + sp + "LIBRARY"
+                    l$ = SCase$("Declare" + sp + "Dynamic" + sp + "Library")
                     IF n = 3 THEN a$ = "Expected DECLARE DYNAMIC LIBRARY " + CHR$(34) + "..." + CHR$(34): GOTO errmes
                     indirectlibrary = 1
                 END IF
@@ -3719,14 +3725,14 @@ DO
                     e$ = getelement$(a$, 3): IF e$ <> "LIBRARY" THEN a$ = "Expected CUSTOMTYPE LIBRARY": GOTO errmes
                     customtypelibrary = 1
                     x = 4
-                    l$ = "DECLARE" + sp + "CUSTOMTYPE" + sp + "LIBRARY"
+                    l$ = SCase$("Declare" + sp + "CustomType" + sp + "Library")
                     indirectlibrary = 1
                 END IF
 
                 IF secondelement$ = "STATIC" THEN
                     e$ = getelement$(a$, 3): IF e$ <> "LIBRARY" THEN a$ = "Expected STATIC LIBRARY": GOTO errmes
                     x = 4
-                    l$ = "DECLARE" + sp + "STATIC" + sp + "LIBRARY"
+                    l$ = SCase$("Declare" + sp + "Static" + sp + "Library")
                     staticlinkedlibrary = 1
                 END IF
 
@@ -4557,7 +4563,11 @@ DO
             a$ = "Unregistered SUB/FUNCTION encountered": GOTO errmes
             createsf:
             IF UCASE$(e$) = "_GL" THEN e$ = "_GL"
-            l$ = firstelement$ + sp + e$ + symbol$
+            IF firstelement$ = "SUB" THEN
+                l$ = SCase$("Sub") + sp + e$ + symbol$
+            ELSE
+                l$ = SCase$("Function") + sp + e$ + symbol$
+            END IF
             id2 = id
             targetid = currentid
 
@@ -4575,9 +4585,9 @@ DO
                         ee$ = RIGHT$(ee$, LEN(ee$) - 1)
                         x = INSTR(ee$, CHR$(34)): IF x = 0 THEN a$ = "Expected " + CHR$(34): GOTO errmes
                         ee$ = LEFT$(ee$, x - 1)
-                        l$ = l$ + sp + "ALIAS" + sp + CHR_QUOTE + ee$ + CHR_QUOTE
+                        l$ = l$ + sp + SCase$("Alias") + sp + CHR_QUOTE + ee$ + CHR_QUOTE
                     ELSE
-                        l$ = l$ + sp + "ALIAS" + sp + ee$
+                        l$ = l$ + sp + SCase$("Alias") + sp + ee$
                     END IF
 
                     'strip fix046$ (created by unquoted periods)
@@ -4778,7 +4788,7 @@ DO
                         IF UCASE$(e$) = "BYVAL" THEN
                             IF declaringlibrary = 0 THEN a$ = "BYVAL can currently only be used with DECLARE LIBRARY": GOTO errmes
                             byvalue = 1: a2$ = RIGHT$(a2$, LEN(a2$) - 6)
-                            IF RIGHT$(l$, 1) = "(" THEN l$ = l$ + sp2 + "BYVAL" ELSE l$ = l$ + sp + "BYVAL"
+                            IF RIGHT$(l$, 1) = "(" THEN l$ = l$ + sp2 + SCase$("ByVal") ELSE l$ = l$ + sp + SCase$("Byval")
                             n2 = numelements(a2$): e$ = getelement$(a2$, 1)
                         END IF
 
@@ -4812,7 +4822,7 @@ DO
                             IF UCASE$(e$) = "AS" THEN
                                 IF m <> 0 AND m <> 2 THEN a$ = "Syntax error": GOTO errmes
                                 m = 3
-                                l$ = l$ + sp + "AS"
+                                l$ = l$ + sp + SCase$("As")
                                 GOTO gotaa2
                             END IF
                             IF m = 1 THEN l$ = l$ + sp + e$: GOTO gotaa2 'ignore contents of option bracket telling how many dimensions (add to layout as is)
@@ -4834,12 +4844,14 @@ DO
                                     t3$ = MID$(RTRIM$(udtxcname(typ AND 511)), 2)
                                 END IF
                                 t3$ = RTRIM$(udtxcname(typ AND 511))
+                                l$ = l$ + sp + t3$
                             ELSE
-                                FOR t3i = 1 TO LEN(t3i)
+                                FOR t3i = 1 TO LEN(t3$)
                                     IF ASC(t3$, t3i) = 32 THEN ASC(t3$, t3i) = ASC(sp)
                                 NEXT
+                                t3$ = SCase2$(t3$)
+                                l$ = l$ + sp + t3$
                             END IF
-                            l$ = l$ + sp + t3$
                         END IF
 
                         IF t2$ = "" THEN t2$ = symbol2$
@@ -4962,7 +4974,7 @@ DO
             END IF 'n>2
             AllowLocalName = 0
 
-            IF addstatic2layout THEN l$ = l$ + sp + "STATIC"
+            IF addstatic2layout THEN l$ = l$ + sp + SCase$("Static")
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
 
             PRINT #17, ");"
@@ -5110,8 +5122,8 @@ DO
                     controllevel = controllevel - 1
                 END IF
 
-                IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = "SUB" ELSE secondelement$ = "FUNCTION"
-                l$ = firstelement$ + sp + secondelement$
+                IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = SCase$("Sub") ELSE secondelement$ = SCase$("Function")
+                l$ = SCase$("End") + sp + secondelement$
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
 
                 staticarraylist = "": staticarraylistn = 0 'remove previously listed arrays
@@ -5155,7 +5167,7 @@ DO
 
 
     IF n >= 1 AND firstelement$ = "CONST" THEN
-        l$ = "CONST"
+        l$ = SCase$("Const")
         'DEF... do not change type, the expression is stored in a suitable type
         'based on its value if type isn't forced/specified
         IF n < 3 THEN a$ = "Expected CONST name = value/expression": GOTO errmes
@@ -5220,15 +5232,15 @@ DO
     predefine:
     IF n >= 2 THEN
         asreq = 0
-        IF firstelement$ = "DEFINT" THEN a$ = a$ + sp + "AS" + sp + "INTEGER": n = n + 2: GOTO definetype
-        IF firstelement$ = "DEFLNG" THEN a$ = a$ + sp + "AS" + sp + "LONG": n = n + 2: GOTO definetype
-        IF firstelement$ = "DEFSNG" THEN a$ = a$ + sp + "AS" + sp + "SINGLE": n = n + 2: GOTO definetype
-        IF firstelement$ = "DEFDBL" THEN a$ = a$ + sp + "AS" + sp + "DOUBLE": n = n + 2: GOTO definetype
-        IF firstelement$ = "DEFSTR" THEN a$ = a$ + sp + "AS" + sp + "STRING": n = n + 2: GOTO definetype
+        IF firstelement$ = "DEFINT" THEN l$ = SCase$("DefInt"): a$ = a$ + sp + "AS" + sp + "INTEGER": n = n + 2: GOTO definetype
+        IF firstelement$ = "DEFLNG" THEN l$ = SCase$("DefLng"): a$ = a$ + sp + "AS" + sp + "LONG": n = n + 2: GOTO definetype
+        IF firstelement$ = "DEFSNG" THEN l$ = SCase$("DefSng"): a$ = a$ + sp + "AS" + sp + "SINGLE": n = n + 2: GOTO definetype
+        IF firstelement$ = "DEFDBL" THEN l$ = SCase$("DefDbl"): a$ = a$ + sp + "AS" + sp + "DOUBLE": n = n + 2: GOTO definetype
+        IF firstelement$ = "DEFSTR" THEN l$ = SCase$("DefStr"): a$ = a$ + sp + "AS" + sp + "STRING": n = n + 2: GOTO definetype
         IF firstelement$ = "_DEFINE" OR (firstelement$ = "DEFINE" AND qb64prefix_set = 1) THEN
             asreq = 1
+            IF firstelement$ = "_DEFINE" THEN l$ = SCase$("_Define") ELSE l$ = SCase$("Define")
             definetype:
-            l$ = firstelement$
             'get type from rhs
             typ$ = ""
             typ2$ = ""
@@ -5261,7 +5273,7 @@ DO
 
             IF i = n THEN
                 IF predefining = 1 THEN GOTO predefined
-                IF asreq THEN l$ = l$ + sp + "AS" + sp + typ2$
+                IF asreq THEN l$ = l$ + sp + SCase$("As") + sp + typ2$
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 GOTO finishednonexec
             END IF
@@ -5286,7 +5298,7 @@ DO
                 l$ = l$ + sp2 + e$
                 IF i = n THEN
                     IF predefining = 1 THEN GOTO predefined
-                    IF asreq THEN l$ = l$ + sp + "AS" + sp + typ2$
+                    IF asreq THEN l$ = l$ + sp + SCase$("As") + sp + typ2$
                     layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                     GOTO finishednonexec
                 END IF
@@ -5310,7 +5322,7 @@ DO
     IF n >= 1 THEN
         IF firstelement$ = "NEXT" THEN
 
-            l$ = "NEXT"
+            l$ = SCase$("Next")
             IF n = 1 THEN GOTO simplenext
             v$ = ""
             FOR i = 2 TO n
@@ -5381,7 +5393,7 @@ DO
             IF n >= 2 THEN
                 e$ = fixoperationorder(getelements$(ca$, 2, n))
                 IF Error_Happened THEN GOTO errmes
-                l$ = "WHILE" + sp + tlayout$
+                l$ = SCase$("While") + sp + tlayout$
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 e$ = evaluate(e$, typ)
                 IF Error_Happened THEN GOTO errmes
@@ -5407,7 +5419,7 @@ DO
             PRINT #12, "}"
             PRINT #12, "ww_exit_" + str2$(controlid(controllevel)) + ":;"
             controllevel = controllevel - 1
-            l$ = "WEND"
+            l$ = SCase$("Wend")
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             GOTO finishednonexec '***no error causing code, event checking done by WHILE***
         END IF
@@ -5428,11 +5440,11 @@ DO
 
             controllevel = controllevel + 1
             controlref(controllevel) = linenumber
-            l$ = "DO"
+            l$ = SCase$("Do")
             IF n >= 2 THEN
                 whileuntil = 0
-                IF secondelement$ = "WHILE" THEN whileuntil = 1: l$ = l$ + sp + "WHILE"
-                IF secondelement$ = "UNTIL" THEN whileuntil = 2: l$ = l$ + sp + "UNTIL"
+                IF secondelement$ = "WHILE" THEN whileuntil = 1: l$ = l$ + sp + SCase$("While")
+                IF secondelement$ = "UNTIL" THEN whileuntil = 2: l$ = l$ + sp + SCase$("Until")
                 IF whileuntil = 0 THEN a$ = "DO ERROR! Expected WHILE or UNTIL after DO.": GOTO errmes
                 IF whileuntil > 0 AND n = 2 THEN a$ = "Condition expected after WHILE/UNTIL": GOTO errmes
                 e$ = fixoperationorder(getelements$(ca$, 3, n))
@@ -5458,14 +5470,14 @@ DO
 
     IF n >= 1 THEN
         IF firstelement$ = "LOOP" THEN
-            l$ = "LOOP"
+            l$ = SCase$("Loop")
             IF controltype(controllevel) <> 3 AND controltype(controllevel) <> 4 THEN a$ = "PROGRAM FLOW ERROR!": GOTO errmes
             IF n >= 2 THEN
                 IF NoChecks = 0 THEN PRINT #12, "S_" + str2$(statementn) + ":;": dynscope = 1
                 IF controltype(controllevel) = 4 THEN a$ = "PROGRAM FLOW ERROR!": GOTO errmes
                 whileuntil = 0
-                IF secondelement$ = "WHILE" THEN whileuntil = 1: l$ = l$ + sp + "WHILE"
-                IF secondelement$ = "UNTIL" THEN whileuntil = 2: l$ = l$ + sp + "UNTIL"
+                IF secondelement$ = "WHILE" THEN whileuntil = 1: l$ = l$ + sp + SCase$("While")
+                IF secondelement$ = "UNTIL" THEN whileuntil = 2: l$ = l$ + sp + SCase$("Until")
                 IF whileuntil = 0 THEN a$ = "LOOP ERROR! Expected WHILE or UNTIL after LOOP.": GOTO errmes
                 IF whileuntil > 0 AND n = 2 THEN a$ = "Condition expected after WHILE/UNTIL": GOTO errmes
                 e$ = fixoperationorder(getelements$(ca$, 3, n))
@@ -5507,7 +5519,7 @@ DO
         IF firstelement$ = "FOR" THEN
             IF NoChecks = 0 THEN PRINT #12, "S_" + str2$(statementn) + ":;": dynscope = 1
 
-            l$ = "FOR"
+            l$ = SCase$("For")
 
             'prevents code from being placed before 'CASE condition' in a SELECT CASE block
             IF SelectCaseCounter > 0 AND SelectCaseHasCaseBlock(SelectCaseCounter) = 0 THEN
@@ -5618,7 +5630,7 @@ DO
             'final
             e$ = fixoperationorder$(p2$)
             IF Error_Happened THEN GOTO errmes
-            l$ = l$ + sp + "TO" + sp + tlayout$
+            l$ = l$ + sp + SCase$("To") + sp + tlayout$
             e$ = evaluatetotyp(e$, ctyp)
             IF Error_Happened THEN GOTO errmes
             PRINT #12, "fornext_finalvalue" + u$ + "=" + e$ + ";"
@@ -5626,7 +5638,7 @@ DO
             'step
             e$ = fixoperationorder$(p3$)
             IF Error_Happened THEN GOTO errmes
-            IF stepused = 1 THEN l$ = l$ + sp + "STEP" + sp + tlayout$
+            IF stepused = 1 THEN l$ = l$ + sp + SCase$("Step") + sp + tlayout$
             e$ = evaluatetotyp(e$, ctyp)
             IF Error_Happened THEN GOTO errmes
             PRINT #12, "fornext_step" + u$ + "=" + e$ + ";"
@@ -5699,7 +5711,7 @@ DO
                     PRINT #12, "}else{"
                     controlstate(controllevel) = 2
                     IF lineelseused = 0 THEN lhscontrollevel = lhscontrollevel - 1
-                    l$ = "ELSE"
+                    l$ = SCase$("Else")
                     layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                     GOTO finishednonexec '***no error causing code, event checking done by IF***
                 END IF
@@ -5723,7 +5735,7 @@ DO
                     PRINT #12, "}else{"
                     e$ = fixoperationorder$(getelements$(ca$, 2, n - 1))
                     IF Error_Happened THEN GOTO errmes
-                    l$ = "ELSEIF" + sp + tlayout$ + sp + "THEN"
+                    l$ = SCase$("ElseIf") + sp + tlayout$ + sp + SCase$("Then")
                     layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                     e$ = evaluate(e$, typ)
                     IF Error_Happened THEN GOTO errmes
@@ -5768,7 +5780,7 @@ DO
 
             e$ = fixoperationorder$(getelements(ca$, 2, n - 1))
             IF Error_Happened THEN GOTO errmes
-            l$ = "IF" + sp + tlayout$
+            l$ = SCase$("If") + sp + tlayout$
             e$ = evaluate(e$, typ)
             IF Error_Happened THEN GOTO errmes
             IF (typ AND ISREFERENCE) THEN e$ = refer$(e$, typ, 0)
@@ -5784,7 +5796,7 @@ DO
                 PRINT #12, "if ((" + e$ + ")||new_error){"
             END IF
 
-            IF iftype = 1 THEN l$ = l$ + sp + "THEN" 'note: 'GOTO' will be added when iftype=2
+            IF iftype = 1 THEN l$ = l$ + sp + SCase$("Then") 'note: 'GOTO' will be added when iftype=2
             layoutdone = 1: IF LEN(layout$) = 0 THEN layout$ = l$ ELSE layout$ = layout$ + sp + l$
 
             IF iftype = 2 THEN 'IF ... GOTO
@@ -5801,7 +5813,7 @@ DO
         IF controltype(controllevel) <> 1 THEN a$ = "END IF without IF": GOTO errmes
         layoutdone = 1
         IF impliedendif = 0 THEN
-            l$ = "END IF"
+            l$ = SCase$("End If")
             IF LEN(layout$) = 0 THEN layout$ = l$ ELSE layout$ = layout$ + sp + l$
         END IF
 
@@ -5822,7 +5834,7 @@ DO
             IF controltype(controllevel) <> 1 THEN a$ = "END IF without IF": GOTO errmes
             layoutdone = 1
             IF impliedendif = 0 THEN
-                l$ = "END" + sp + "IF"
+                l$ = SCase$("End" + sp + "If")
                 IF LEN(layout$) = 0 THEN layout$ = l$ ELSE layout$ = layout$ + sp + l$
             END IF
 
@@ -5856,14 +5868,14 @@ DO
                 IF n = 2 THEN a$ = "Expected SELECT CASE expression": GOTO errmes
                 e$ = fixoperationorder(getelements$(ca$, 3, n))
                 IF Error_Happened THEN GOTO errmes
-                l$ = "SELECT EVERYCASE " + tlayout$
+                l$ = SCase$("Select EveryCase ") + tlayout$
             ELSE
                 EveryCaseSet(SelectCaseCounter) = 0
                 IF n = 1 OR secondelement$ <> "CASE" THEN a$ = "Expected CASE or EVERYCASE": GOTO errmes
                 IF n = 2 THEN a$ = "Expected SELECT CASE expression": GOTO errmes
                 e$ = fixoperationorder(getelements$(ca$, 3, n))
                 IF Error_Happened THEN GOTO errmes
-                l$ = "SELECT CASE " + tlayout$
+                l$ = SCase$("Select Case ") + tlayout$
             END IF
 
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
@@ -5970,7 +5982,7 @@ DO
 
             controllevel = controllevel - 1
             SelectCaseCounter = SelectCaseCounter - 1
-            l$ = "END" + sp + "SELECT"
+            l$ = SCase$("End" + sp + "Select")
             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             GOTO finishednonexec '***no error causing code, event checking done by SELECT CASE***
         END IF
@@ -5986,7 +5998,7 @@ DO
     IF n >= 1 THEN
         IF firstelement$ = "CASE" THEN
 
-            l$ = "CASE"
+            l$ = SCase$("Case")
             'complete current case if necessary
             '18=CASE (awaiting END SELECT/CASE/CASE ELSE)
             '19=CASE ELSE (awaiting END SELECT)
@@ -6067,7 +6079,7 @@ DO
                     IF EveryCaseSet(SelectCaseCounter) THEN PRINT #12, "if (sc_" + str2$(controlid(controllevel)) + "_var==0) {"
                     controllevel = controllevel + 1: controltype(controllevel) = 19
                     controlref(controllevel) = controlref(controllevel - 1)
-                    l$ = l$ + sp + "ELSE"
+                    l$ = l$ + sp + SCase$("Else")
                     layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                     GOTO finishednonexec '***no error causing code, event checking done by SELECT CASE***
                 END IF
@@ -6117,7 +6129,7 @@ DO
                             IF i2 = 1 THEN e$ = el$ ELSE e$ = er$
                             e$ = fixoperationorder(e$)
                             IF Error_Happened THEN GOTO errmes
-                            IF i2 = 1 THEN l$ = l$ + sp + tlayout$ ELSE l$ = l$ + sp + "TO" + sp + tlayout$
+                            IF i2 = 1 THEN l$ = l$ + sp + tlayout$ ELSE l$ = l$ + sp + SCase$("TO") + sp + tlayout$
                             e$ = evaluate(e$, typ)
                             IF Error_Happened THEN GOTO errmes
                             IF (typ AND ISREFERENCE) THEN e$ = refer(e$, typ, 0)
@@ -6185,7 +6197,7 @@ DO
                         IF o$ = ">=" THEN o = 1
                         IF o$ = "<=" THEN o = 1
                         IF o <> 1 THEN a$ = "Expected IS =,<>,>,<,>=,<= expression": GOTO errmes
-                        l$ = l$ + sp + "IS" + sp + o2$
+                        l$ = l$ + sp + SCase$("Is") + sp + o2$
                         e$ = getelements$(e$, 3, n2)
                         'fall through to type 3 using modified e$ & o$
                     END IF
@@ -6266,7 +6278,7 @@ DO
     IF n > 1 THEN
         IF firstelement$ = "PALETTE" THEN
             IF secondelement$ = "USING" THEN
-                l$ = "PALETTE" + sp + "USING" + sp
+                l$ = SCase$("Palette" + sp + "Using" + sp)
                 IF n < 3 THEN a$ = "Expected PALETTE USING array-name": GOTO errmes
                 'check array
                 e$ = getelement$(ca$, 3)
@@ -6309,22 +6321,22 @@ DO
 
     IF firstelement$ = "KEY" THEN
         IF n = 1 THEN a$ = "Expected KEY ...": GOTO errmes
-        l$ = "KEY" + sp
+        l$ = SCase$("KEY") + sp
         IF secondelement$ = "OFF" THEN
             IF n > 2 THEN a$ = "Expected KEY OFF only": GOTO errmes
-            l$ = l$ + "OFF": layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
+            l$ = l$ + SCase$("Off"): layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             PRINT #12, "key_off();"
             GOTO finishedline
         END IF
         IF secondelement$ = "ON" THEN
             IF n > 2 THEN a$ = "Expected KEY ON only": GOTO errmes
-            l$ = l$ + "ON": layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
+            l$ = l$ + SCase$("On"): layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             PRINT #12, "key_on();"
             GOTO finishedline
         END IF
         IF secondelement$ = "LIST" THEN
             IF n > 2 THEN a$ = "Expected KEY LIST only": GOTO errmes
-            l$ = l$ + "LIST": layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
+            l$ = l$ + SCase$("List"): layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             PRINT #12, "key_list();"
             GOTO finishedline
         END IF
@@ -6382,7 +6394,7 @@ DO
         GOTO fielderror
         fieldgotfn:
         IF e$ = "#" OR LEN(e$) = 0 THEN GOTO fielderror
-        IF LEFT$(e$, 2) = "#" + sp THEN e$ = RIGHT$(e$, LEN(e$) - 2): l$ = "FIELD" + sp + "#" + sp2 ELSE l$ = "FIELD" + sp
+        IF LEFT$(e$, 2) = "#" + sp THEN e$ = RIGHT$(e$, LEN(e$) - 2): l$ = SCase$("Field") + sp + "#" + sp2 ELSE l$ = SCase$("Field") + sp
         e$ = fixoperationorder(e$)
         IF Error_Happened THEN GOTO errmes
         l$ = l$ + tlayout$ + sp2 + "," + sp
@@ -6409,7 +6421,7 @@ DO
         IF LEN(e$) = 0 THEN GOTO fielderror
         e$ = fixoperationorder(e$)
         IF Error_Happened THEN GOTO errmes
-        l$ = l$ + tlayout$ + sp + "AS" + sp
+        l$ = l$ + tlayout$ + sp + SCase$("As") + sp
         sizee$ = evaluatetotyp(e$, 32&)
         IF Error_Happened THEN GOTO errmes
 
@@ -6473,10 +6485,11 @@ DO
     IF n = 2 THEN
         IF firstelement$ = "EXIT" THEN
 
-            l$ = firstelement$ + sp + secondelement$
+            l$ = SCase$("Exit") + sp
 
             IF secondelement$ = "DO" THEN
                 'scan backwards until previous control level reached
+                l$ = l$ + SCase$("Do")
                 FOR i = controllevel TO 1 STEP -1
                     t = controltype(i)
                     IF t = 3 OR t = 4 THEN
@@ -6490,6 +6503,7 @@ DO
 
             IF secondelement$ = "FOR" THEN
                 'scan backwards until previous control level reached
+                l$ = l$ + SCase$("For")
                 FOR i = controllevel TO 1 STEP -1
                     t = controltype(i)
                     IF t = 2 THEN
@@ -6503,6 +6517,7 @@ DO
 
             IF secondelement$ = "WHILE" THEN
                 'scan backwards until previous control level reached
+                l$ = l$ + SCase$("While")
                 FOR i = controllevel TO 1 STEP -1
                     t = controltype(i)
                     IF t = 5 THEN
@@ -6516,6 +6531,7 @@ DO
 
             IF secondelement$ = "SELECT" THEN
                 'scan backwards until previous control level reached
+                l$ = l$ + SCase$("Select")
                 FOR i = controllevel TO 1 STEP -1
                     t = controltype(i)
                     IF t = 18 OR t = 19 THEN 'CASE/CASE ELSE
@@ -6529,6 +6545,7 @@ DO
 
             IF secondelement$ = "CASE" THEN
                 'scan backwards until previous control level reached
+                l$ = l$ + SCase$("Case")
                 FOR i = controllevel TO 1 STEP -1
                     t = controltype(i)
                     IF t = 18 THEN 'CASE
@@ -6561,7 +6578,7 @@ DO
             IF i > n THEN a$ = "Expected (": GOTO errmes
             a2$ = getelement$(ca$, i): i = i + 1
             IF a2$ <> "(" THEN a$ = "Expected (": GOTO errmes
-            l$ = "ON" + sp + "STRIG" + sp2 + "("
+            l$ = SCase$("On" + sp + "Strig" + sp2 + "(")
             IF i > n THEN a$ = "Expected ...": GOTO errmes
             B = 0
             x = 0
@@ -6658,7 +6675,7 @@ DO
                     Labels(r).Error_Line = linenumber
                     Labels(r).Scope_Restriction = subfuncn
                 END IF 'x
-                l$ = l$ + "GOSUB" + sp + tlayout$
+                l$ = l$ + SCase$("GoSub") + sp + tlayout$
 
                 PRINT #30, "if(strig_event_id==" + str2$(onstrigid) + ")goto LABEL_" + a2$ + ";"
 
@@ -6752,7 +6769,7 @@ DO
             IF i > n THEN a$ = "Expected (": GOTO errmes
             a2$ = getelement$(ca$, i): i = i + 1
             IF a2$ <> "(" THEN a$ = "Expected (": GOTO errmes
-            l$ = "ON" + sp + "TIMER" + sp2 + "("
+            l$ = SCase$("On" + sp + "Timer" + sp2 + "(")
             IF i > n THEN a$ = "Expected ...": GOTO errmes
             B = 0
             x = 0
@@ -6838,7 +6855,7 @@ DO
                     Labels(r).Error_Line = linenumber
                     Labels(r).Scope_Restriction = subfuncn
                 END IF 'x
-                l$ = l$ + "GOSUB" + sp + tlayout$
+                l$ = l$ + SCase$("GoSub") + sp + tlayout$
 
                 PRINT #25, "if(timer_event_id==" + str2$(ontimerid) + ")goto LABEL_" + a2$ + ";"
 
@@ -6931,7 +6948,7 @@ DO
             IF i > n THEN a$ = "Expected (": GOTO errmes
             a2$ = getelement$(ca$, i): i = i + 1
             IF a2$ <> "(" THEN a$ = "Expected (": GOTO errmes
-            l$ = "ON" + sp + "KEY" + sp2 + "("
+            l$ = SCase$("On" + sp + "Key" + sp2 + "(")
             IF i > n THEN a$ = "Expected ...": GOTO errmes
             B = 0
             x = 0
@@ -6997,7 +7014,7 @@ DO
                     Labels(r).Error_Line = linenumber
                     Labels(r).Scope_Restriction = subfuncn
                 END IF 'x
-                l$ = l$ + "GOSUB" + sp + tlayout$
+                l$ = l$ + SCase$("GoSub") + sp + tlayout$
 
                 PRINT #28, "if(key_event_id==" + str2$(onkeyid) + ")goto LABEL_" + a2$ + ";"
 
@@ -7108,7 +7125,7 @@ DO
 
 
 
-            l$ = "SHARED"
+            l$ = SCase$("Shared")
             subfuncshr:
 
             'get variable name
@@ -7138,7 +7155,7 @@ DO
                 ts$ = ""
                 t3$ = ""
                 IF getelement$(a$, i) = "AS" THEN
-                    l2$ = l2$ + sp + "AS"
+                    l2$ = l2$ + sp + SCase$("As")
                     getshrtyp:
                     i = i + 1
                     t2$ = getelement$(a$, i)
@@ -7158,14 +7175,15 @@ DO
                     method = 0
                     IF (t AND ISUDT) = 0 THEN
                         ts$ = type2symbol$(t$)
+                        l2$ = l2$ + sp + SCase2$(t3$)
                     ELSE
                         t3$ = RTRIM$(udtxcname(t AND 511))
                         IF RTRIM$(udtxcname(t AND 511)) = "_MEM" AND UCASE$(t$) = "MEM" AND qb64prefix_set = 1 THEN
                             t3$ = MID$(RTRIM$(udtxcname(t AND 511)), 2)
                         END IF
+                        l2$ = l2$ + sp + t3$
                     END IF
                     IF Error_Happened THEN GOTO errmes
-                    l2$ = l2$ + sp + t3$
 
                 END IF 'as
 
@@ -7279,7 +7297,7 @@ DO
                 t3$ = ""
                 n$ = ""
                 previousElement$ = ""
-                l2$ = sp + "AS"
+                l2$ = sp + SCase$("As")
                 sharedAsLayoutAdded = 0
                 getshrtyp2:
                 i = i + 1
@@ -7306,14 +7324,15 @@ DO
                 method = 0
                 IF (t AND ISUDT) = 0 THEN
                     ts$ = type2symbol$(t$)
+                    l2$ = l2$ + sp + SCase2$(t3$)
                 ELSE
                     t3$ = RTRIM$(udtxcname(t AND 511))
                     IF RTRIM$(udtxcname(t AND 511)) = "_MEM" AND UCASE$(t$) = "MEM" AND qb64prefix_set = 1 THEN
                         t3$ = MID$(RTRIM$(udtxcname(t AND 511)), 2)
                     END IF
+                    l2$ = l2$ + sp + t3$
                 END IF
                 IF Error_Happened THEN GOTO errmes
-                l2$ = l2$ + sp + t3$
 
                 subfuncshr2:
                 s$ = removesymbol(n$)
@@ -7364,7 +7383,7 @@ DO
                 IF LEN(subfunc) = 0 THEN a$ = "EXIT " + secondelement$ + " must be used within a " + secondelement$: GOTO errmes
 
                 PRINT #12, "goto exit_subfunc;"
-                IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = "SUB" ELSE secondelement$ = "FUNCTION"
+                IF LEFT$(subfunc, 4) = "SUB_" THEN secondelement$ = SCase$("Sub") ELSE secondelement$ = SCase$("Function")
                 l$ = firstelement$ + sp + secondelement$
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 GOTO finishedline
@@ -7439,7 +7458,7 @@ DO
             'validate stringvariable$
             stringvariable$ = fixoperationorder$(stringvariable$)
             IF Error_Happened THEN GOTO errmes
-            l$ = "ASC" + sp2 + "(" + sp2 + tlayout$
+            l$ = SCase$("Asc") + sp2 + "(" + sp2 + tlayout$
 
             e$ = evaluate(stringvariable$, sourcetyp)
             IF Error_Happened THEN GOTO errmes
@@ -7534,7 +7553,7 @@ DO
             'check if it is a valid source string
             stringvariable$ = fixoperationorder$(stringvariable$)
             IF Error_Happened THEN GOTO errmes
-            l$ = "MID$" + sp2 + "(" + sp2 + tlayout$
+            l$ = SCase$("Mid$") + sp2 + "(" + sp2 + tlayout$
             e$ = evaluate(stringvariable$, sourcetyp)
             IF Error_Happened THEN GOTO errmes
             IF (sourcetyp AND ISREFERENCE) = 0 OR (sourcetyp AND ISSTRING) = 0 THEN a$ = "MID$ expects a string variable/array-element as its first argument": GOTO errmes
@@ -7573,7 +7592,7 @@ DO
     IF n >= 2 THEN
         IF firstelement$ = "ERASE" THEN
             i = 2
-            l$ = "ERASE"
+            l$ = SCase$("Erase")
             erasenextarray:
             var$ = getelement$(ca$, i)
             x$ = var$: ls$ = removesymbol(x$)
@@ -7675,25 +7694,29 @@ DO
     'DIM/REDIM/STATIC
     IF n >= 2 THEN
         dimoption = 0: redimoption = 0: commonoption = 0
-        IF firstelement$ = "DIM" THEN dimoption = 1
+        IF firstelement$ = "DIM" THEN l$ = SCase$("Dim"): dimoption = 1
         IF firstelement$ = "REDIM" THEN
+            l$ = SCase$("ReDim")
             dimoption = 2: redimoption = 1
             IF secondelement$ = "_PRESERVE" OR (secondelement$ = "PRESERVE" AND qb64prefix_set = 1) THEN
                 redimoption = 2
+                IF secondelement$ = "_PRESERVE" THEN
+                    l$ = l$ + sp + SCase$("_Preserve")
+                ELSE
+                    l$ = l$ + sp + SCase$("Preserve")
+                END IF
                 IF n = 2 THEN a$ = "Expected REDIM " + qb64prefix$ + "PRESERVE ...": GOTO errmes
             END IF
         END IF
-        IF firstelement$ = "STATIC" THEN dimoption = 3
-        IF firstelement$ = "COMMON" THEN dimoption = 1: commonoption = 1
+        IF firstelement$ = "STATIC" THEN l$ = SCase$("Static"): dimoption = 3
+        IF firstelement$ = "COMMON" THEN l$ = SCase$("Common"): dimoption = 1: commonoption = 1
         IF dimoption THEN
 
-            l$ = firstelement$
-
             IF dimoption = 3 AND subfuncn = 0 THEN a$ = "STATIC must be used within a SUB/FUNCTION": GOTO errmes
             IF commonoption = 1 AND subfuncn <> 0 THEN a$ = "COMMON cannot be used within a SUB/FUNCTION": GOTO errmes
 
             i = 2
-            IF redimoption = 2 THEN i = 3: l$ = l$ + sp + secondelement$
+            IF redimoption = 2 THEN i = 3
 
             IF dimoption <> 3 THEN 'shared cannot be static
                 a2$ = getelement(a$, i)
@@ -7701,7 +7724,7 @@ DO
                     IF subfuncn <> 0 THEN a$ = "DIM/REDIM SHARED invalid within a SUB/FUNCTION": GOTO errmes
                     dimshared = 1
                     i = i + 1
-                    l$ = l$ + sp + a2$
+                    l$ = l$ + sp + SCase$("Shared")
                 END IF
             END IF
 
@@ -7779,7 +7802,7 @@ DO
                 END IF
 
                 IF d$ = "AS" THEN
-                    appendtype$ = sp + "AS"
+                    appendtype$ = sp + SCase$("As")
                     typ$ = ""
                     FOR i = i TO n
                         d$ = getelement(a$, i)
@@ -7788,7 +7811,7 @@ DO
                         appendtype$ = appendtype$ + sp + d$
                         d$ = ""
                     NEXT
-                    appendtype$ = UCASE$(appendtype$) 'capitalise default types (udt override this later if necessary)
+                    appendtype$ = SCase2$(appendtype$) 'capitalise default types (udt override this later if necessary)
                     typ$ = RTRIM$(typ$)
                     GOTO dimgottyp
                 END IF
@@ -8053,7 +8076,7 @@ DO
                                                 DO WHILE INSTR(dim2typepassback$, " ")
                                                     ASC(dim2typepassback$, INSTR(dim2typepassback$, " ")) = ASC(sp)
                                                 LOOP
-                                                dim2typepassback$ = UCASE$(dim2typepassback$)
+                                                dim2typepassback$ = SCase2$(dim2typepassback$)
                                             END IF
                                         END IF 'method 0
 
@@ -8234,7 +8257,7 @@ DO
                     commonarraylisted:
 
                     IF LEN(appendtype$) AND newDimSyntax = -1 THEN
-                        IF LEN(dim2typepassback$) THEN appendtype$ = sp + "AS" + sp + dim2typepassback$
+                        IF LEN(dim2typepassback$) THEN appendtype$ = sp + SCase$("As") + sp + dim2typepassback$
                         IF newDimSyntaxTypePassBack = 0 THEN
                             newDimSyntaxTypePassBack = -1
                             l$ = l$ + appendtype$
@@ -8248,7 +8271,7 @@ DO
                     END IF
 
                     IF LEN(appendtype$) AND newDimSyntax = 0 THEN
-                        IF LEN(dim2typepassback$) THEN appendtype$ = sp + "AS" + sp + dim2typepassback$
+                        IF LEN(dim2typepassback$) THEN appendtype$ = sp + SCase$("As") + sp + dim2typepassback$
                         l$ = l$ + appendtype$
                     END IF
 
@@ -8279,7 +8302,7 @@ DO
 
                 'estabilish the data type:
                 appendname$ = ""
-                appendtype$ = sp + "AS"
+                appendtype$ = sp + SCase$("As")
                 typ$ = ""
                 varname$ = ""
                 previousElement$ = ""
@@ -8403,7 +8426,7 @@ DO
     'goto
     IF n = 2 THEN
         IF getelement$(a$, 1) = "GOTO" THEN
-            l$ = "GOTO"
+            l$ = SCase$("GoTo")
             a2$ = getelement$(ca$, 2)
             THENGOTO:
             IF validlabel(a2$) = 0 THEN a$ = "Invalid label!": GOTO errmes
@@ -8442,7 +8465,7 @@ DO
 
     IF n = 1 THEN
         IF firstelement$ = "_CONTINUE" OR (firstelement$ = "CONTINUE" AND qb64prefix_set = 1) THEN
-            l$ = UCASE$(firstelement$)
+            IF firstelement$ = "_CONTINUE" THEN l$ = SCase$("_Continue") ELSE l$ = SCase$("Continue")
             'scan backwards until previous control level reached
             FOR i = controllevel TO 1 STEP -1
                 t = controltype(i)
@@ -8465,7 +8488,7 @@ DO
     END IF
 
     IF firstelement$ = "RUN" THEN 'RUN
-        l$ = "RUN"
+        l$ = SCase$("Run")
         IF n = 1 THEN
             'no parameters
             PRINT #12, "sub_run_init();" 'note: called first to free up screen-locked image handles
@@ -8544,7 +8567,7 @@ DO
 
 
     IF firstelement$ = "END" THEN
-        l$ = "END"
+        l$ = SCase$("End")
         IF n > 1 THEN
             e$ = getelements$(ca$, 2, n)
             e$ = fixoperationorder$(e$): IF Error_Happened THEN GOTO errmes
@@ -8567,7 +8590,7 @@ DO
     END IF
 
     IF firstelement$ = "SYSTEM" THEN
-        l$ = "SYSTEM"
+        l$ = SCase$("System")
         IF n > 1 THEN
             e$ = getelements$(ca$, 2, n)
             e$ = fixoperationorder$(e$): IF Error_Happened THEN GOTO errmes
@@ -8595,12 +8618,12 @@ DO
 
     IF n >= 1 THEN
         IF firstelement$ = "STOP" THEN
-            l$ = "STOP"
+            l$ = SCase$("Stop")
             IF n > 1 THEN
                 e$ = getelements$(ca$, 2, n)
                 e$ = fixoperationorder$(e$)
                 IF Error_Happened THEN GOTO errmes
-                l$ = "STOP" + sp + tlayout$
+                l$ = SCase$("Stop") + sp + tlayout$
                 e$ = evaluatetotyp(e$, 64)
                 IF Error_Happened THEN GOTO errmes
                 'note: this value is currently ignored but evaluated for checking reasons
@@ -8625,7 +8648,7 @@ DO
         IF firstelement$ = "RETURN" THEN
             IF n = 1 THEN
                 PRINT #12, "#include " + CHR$(34) + "ret" + str2$(subfuncn) + ".txt" + CHR$(34)
-                l$ = "RETURN"
+                l$ = SCase$("Return")
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 GOTO finishedline
             ELSE
@@ -8663,7 +8686,7 @@ DO
                 END IF 'x
 
                 PRINT #12, "goto LABEL_" + a2$ + ";"
-                l$ = "RETURN" + sp + tlayout$
+                l$ = SCase$("Return") + sp + tlayout$
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 GOTO finishedline
             END IF
@@ -8672,7 +8695,7 @@ DO
 
     IF n >= 1 THEN
         IF firstelement$ = "RESUME" THEN
-            l$ = "RESUME"
+            l$ = SCase$("Resume")
             IF n = 1 THEN
                 resumeprev:
 
@@ -8689,7 +8712,7 @@ DO
 
                 PRINT #12, "if (!error_handling){error(20);}else{error_handling=0; error_err=0; return;}"
 
-                l$ = l$ + sp + "NEXT"
+                l$ = l$ + sp + SCase$("Next")
                 layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                 GOTO finishedline
             END IF
@@ -8730,7 +8753,7 @@ DO
 
     IF n = 4 THEN
         IF getelements(a$, 1, 3) = "ON" + sp + "ERROR" + sp + "GOTO" THEN
-            l$ = "ON" + sp + "ERROR" + sp + "GOTO"
+            l$ = SCase$("On" + sp + "Error" + sp + "GoTo")
             lbl$ = getelement$(ca$, 4)
             IF lbl$ = "0" THEN
                 PRINT #12, "error_goto_line=0;"
@@ -8780,7 +8803,7 @@ DO
 
     IF n >= 1 THEN
         IF firstelement$ = "RESTORE" THEN
-            l$ = "RESTORE"
+            l$ = SCase$("Restore")
             IF n = 1 THEN
                 PRINT #12, "data_offset=0;"
             ELSE
@@ -8853,7 +8876,7 @@ DO
             var$ = e$
             IF e$ = "" OR ne <> 2 THEN a$ = "Expected " + qb64prefix$ + "MEMGET mem-reference, offset, variable": GOTO errmes
 
-            l$ = UCASE$(firstelement$) + sp
+            IF firstelement$ = "_MEMGET" THEN l$ = SCase$("_MemGet") + sp ELSE l$ = SCase$("MemGet") + sp
 
             e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes
             l$ = l$ + tlayout$
@@ -8954,7 +8977,7 @@ DO
             IF ne < 2 OR e$ = "" THEN a$ = "Expected " + qb64prefix$ + "MEMPUT mem-reference, offset, variable|value[AS type]": GOTO errmes
             IF ne = 2 THEN var$ = e$ ELSE typ$ = UCASE$(e$)
 
-            l$ = UCASE$(firstelement$) + sp
+            IF firstelement$ = "_MEMPUT" THEN l$ = SCase$("_MemPut") + sp ELSE l$ = SCase$("MemPut") + sp
 
             e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes
             l$ = l$ + tlayout$
@@ -9029,7 +9052,7 @@ DO
                 IF (t AND ISPOINTER) THEN t = t - ISPOINTER
                 'attempt conversion...
                 e$ = fixoperationorder$(var$): IF Error_Happened THEN GOTO errmes
-                l$ = l$ + sp2 + "," + sp + tlayout$ + sp + "AS" + sp + typ$
+                l$ = l$ + sp2 + "," + sp + tlayout$ + sp + SCase$("As") + sp + typ$
                 e$ = evaluatetotyp(e$, t): IF Error_Happened THEN GOTO errmes
                 st$ = typ2ctyp$(t, "")
                 varsize$ = str2((t AND 511) \ 8)
@@ -9091,7 +9114,7 @@ DO
             IF ne < 3 OR e$ = "" THEN a$ = "Expected " + qb64prefix$ + "MEMFILL mem-reference, offset, bytes, variable|value[AS type]": GOTO errmes
             IF ne = 3 THEN var$ = e$ ELSE typ$ = UCASE$(e$)
 
-            l$ = UCASE$(firstelement$) + sp
+            IF firstelement$ = "_MEMFILL" THEN l$ = SCase$("_MemFill") + sp ELSE l$ = SCase$("MemFill") + sp
 
             e$ = fixoperationorder$(blk$): IF Error_Happened THEN GOTO errmes
             l$ = l$ + tlayout$
@@ -9138,7 +9161,7 @@ DO
                 IF (t AND ISPOINTER) THEN t = t - ISPOINTER
                 'attempt conversion...
                 e$ = fixoperationorder$(var$): IF Error_Happened THEN GOTO errmes
-                l$ = l$ + sp2 + "," + sp + tlayout$ + sp + "AS" + sp + typ$
+                l$ = l$ + sp2 + "," + sp + tlayout$ + sp + SCase$("As") + sp + typ$
                 e$ = evaluatetotyp(e$, t): IF Error_Happened THEN GOTO errmes
 
                 c$ = "sub__memfill_"
@@ -9223,7 +9246,7 @@ DO
                         IF argn = 1 THEN 'interrupt number
                             e$ = fixoperationorder$(e$)
                             IF Error_Happened THEN GOTO errmes
-                            l$ = "CALL" + sp + n$ + sp2 + "(" + sp2 + tlayout$
+                            l$ = SCase$("Call") + sp + n$ + sp2 + "(" + sp2 + tlayout$
                             IF cispecial = 1 THEN l$ = n$ + sp + tlayout$
                             e$ = evaluatetotyp(e$, 64&)
                             IF Error_Happened THEN GOTO errmes
@@ -9262,7 +9285,7 @@ DO
 
             'call to CALL ABSOLUTE beyond reasonable doubt
             IF n$ = "ABSOLUTE" THEN
-                l$ = "CALL" + sp + "ABSOLUTE" + sp2 + "(" + sp2
+                l$ = SCase$("Call" + sp + "Absolute" + sp2 + "(" + sp2)
                 argn = 0
                 n = numelements(a$)
                 B = 0
@@ -9458,8 +9481,11 @@ DO
                 IF firstelement$ = "CLOSE" OR firstelement$ = "RESET" THEN
                     IF firstelement$ = "RESET" THEN
                         IF n > 1 THEN a$ = "Syntax error": GOTO errmes
+                        l$ = SCase$("Reset")
+                    ELSE
+                        l$ = SCase$("Close")
                     END IF
-                    l$ = firstelement$
+
                     IF n = 1 THEN
                         PRINT #12, "sub_close(NULL,0);" 'closes all files
                     ELSE
@@ -9586,7 +9612,7 @@ DO
                 IF firstelement$ = "INPUT" THEN 'file input
                     IF n > 1 THEN
                         IF getelement$(a$, 2) = "#" THEN
-                            l$ = "INPUT" + sp + "#": IF lineinput THEN l$ = "LINE" + sp + l$
+                            l$ = SCase$("Input") + sp + "#": IF lineinput THEN l$ = SCase$("Line") + sp + l$
 
                             u$ = str2$(uniquenumber)
                             'which file?
@@ -9683,7 +9709,7 @@ DO
 
 
                 IF firstelement$ = "INPUT" THEN
-                    l$ = "INPUT": IF lineinput THEN l$ = "LINE" + sp + l$
+                    l$ = SCase$("Input"): IF lineinput THEN l$ = SCase$("Line") + sp + l$
                     commaneeded = 0
                     i = 2
 
@@ -9875,7 +9901,7 @@ DO
                 'LSET/RSET
                 IF firstelement$ = "LSET" OR firstelement$ = "RSET" THEN
                     IF n = 1 THEN a$ = "Expected " + firstelement$ + " ...": GOTO errmes
-                    l$ = firstelement$
+                    IF firstelement$ = "LSET" THEN l$ = SCase$("LSet") ELSE l$ = SCase$("RSet")
                     dest$ = ""
                     source$ = ""
                     part = 1
@@ -9954,7 +9980,7 @@ DO
                     IF (e1typ AND ISREFERENCE) = 0 OR (e2typ AND ISREFERENCE) = 0 THEN a$ = "Expected variable": GOTO errmes
 
                     layoutdone = 1
-                    l$ = "SWAP" + sp + e1l$ + sp2 + "," + sp + e2l$
+                    l$ = SCase$("Swap") + sp + e1l$ + sp2 + "," + sp + e2l$
                     IF LEN(layout$) = 0 THEN layout$ = l$ ELSE layout$ = layout$ + sp + l$
 
                     'swap strings?
@@ -10044,7 +10070,7 @@ DO
                             l$ = getelement$(a$, 3)
                             IF l$ <> "0" AND l$ <> "1" THEN a$ = "Expected OPTION BASE 0 or 1": GOTO errmes
                             IF l$ = "1" THEN optionbase = 1 ELSE optionbase = 0
-                            l$ = "OPTION" + sp + "BASE" + sp + l$
+                            l$ = SCase$("Option" + sp + "Base") + sp + l$
                             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                             GOTO finishedline
                         CASE "EXPLICIT", "_EXPLICIT"
@@ -10057,7 +10083,8 @@ DO
                             IF LEN(layout$) THEN a$ = "OPTION " + qb64prefix$ + "EXPLICIT must come before any other statement": GOTO errmes
                             IF linenumber > 1 AND opex_comments = 0 THEN a$ = "OPTION " + qb64prefix$ + "EXPLICIT must come before any other statement": GOTO errmes
                             optionexplicit = -1
-                            l$ = "OPTION" + sp + e$
+                            l$ = SCase$("Option") + sp
+                            IF e$ = "EXPLICIT" THEN l$ = l$ + SCase$("Explicit") ELSE l$ = l$ + SCase$("_Explicit")
                             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                             GOTO finishedline
                         CASE "EXPLICITARRAY", "_EXPLICITARRAY"
@@ -10070,7 +10097,8 @@ DO
                             IF LEN(layout$) THEN a$ = "OPTION " + qb64prefix$ + "EXPLICITARRAY must come before any other statement": GOTO errmes
                             IF linenumber > 1 AND opex_comments = 0 THEN a$ = "OPTION " + qb64prefix$ + "EXPLICITARRAY must come before any other statement": GOTO errmes
                             optionexplicitarray = -1
-                            l$ = "OPTION" + sp + e$
+                            l$ = SCase$("Option") + sp
+                            IF e$ = "EXPLICITARRAY" THEN l$ = l$ + SCase$("ExplicitArray") ELSE l$ = l$ + SCase$("_ExplicitArray")
                             layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
                             GOTO finishedline
                         CASE ELSE
@@ -10121,10 +10149,19 @@ DO
                 '       it has one extra index which is the arg after
 
                 IF usecall THEN
-                    IF usecall = 1 THEN l$ = "CALL" + sp + RTRIM$(id.cn) + RTRIM$(id.musthave) + sp2 + "(" + sp2
-                    IF usecall = 2 THEN l$ = "CALL" + sp + RTRIM$(id.cn) + RTRIM$(id.musthave) + sp 'sp at end for easy parsing
+                    IF id.internal_subfunc THEN
+                        IF usecall = 1 THEN l$ = SCase$("Call") + sp + SCase$(RTRIM$(id.cn)) + RTRIM$(id.musthave) + sp2 + "(" + sp2
+                        IF usecall = 2 THEN l$ = SCase$("Call") + sp + SCase$(RTRIM$(id.cn)) + RTRIM$(id.musthave) + sp 'sp at end for easy parsing
+                    ELSE
+                        IF usecall = 1 THEN l$ = SCase$("Call") + sp + RTRIM$(id.cn) + RTRIM$(id.musthave) + sp2 + "(" + sp2
+                        IF usecall = 2 THEN l$ = SCase$("Call") + sp + RTRIM$(id.cn) + RTRIM$(id.musthave) + sp 'sp at end for easy parsing
+                    END IF
                 ELSE
-                    l$ = RTRIM$(id.cn) + RTRIM$(id.musthave) + sp
+                    IF id.internal_subfunc THEN
+                        l$ = SCase$(RTRIM$(id.cn)) + RTRIM$(id.musthave) + sp
+                    ELSE
+                        l$ = RTRIM$(id.cn) + RTRIM$(id.musthave) + sp
+                    END IF
                 END IF
 
                 subcall$ = RTRIM$(id.callname) + "("
@@ -10729,7 +10766,7 @@ DO
                         IF x2$ = "," THEN x2$ = x2$ + sp: GOTO customlaychar2
 
                         IF x$ = CHR$(0) THEN 'substitution
-                            IF x2$ = "STEP" THEN x2$ = x2$ + sp2: GOTO customlaychar2
+                            IF x2$ = "STEP" THEN x2$ = SCase$("Step") + sp2: GOTO customlaychar2
                             x2$ = x2$ + sp: GOTO customlaychar2
                         END IF
 
@@ -10793,7 +10830,7 @@ DO
             IF n = 1 THEN a$ = "Syntax error": GOTO errmes
             ca$ = RIGHT$(ca$, LEN(ca$) - 4)
             n = n - 1
-            l$ = "LET"
+            l$ = SCase$("Let")
             IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
             'note: layoutdone=1 will be set later
             GOTO letused
@@ -13181,7 +13218,7 @@ FUNCTION allocarray (n2$, elements$, elementsize, udt)
 
             e3base$ = fixoperationorder$(e3base$)
             IF Error_Happened THEN EXIT FUNCTION
-            IF basegiven THEN l$ = l$ + tlayout$ + sp + "TO" + sp
+            IF basegiven THEN l$ = l$ + tlayout$ + sp + SCase$("To") + sp
             e3base$ = evaluatetotyp$(e3base$, 64&)
             IF Error_Happened THEN EXIT FUNCTION
 
@@ -17952,15 +17989,15 @@ FUNCTION findid& (n2$)
     'some subs require a second argument (eg. PUT #, DEF SEG, etc.)
     IF ids(i).subfunc = 2 THEN
         IF ASC(ids(i).secondargmustbe) <> 32 THEN 'exists?
-            IF RTRIM$(secondarg$) = RTRIM$(ids(i).secondargmustbe) THEN
-            ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargmustbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) = MID$(RTRIM$(ids(i).secondargmustbe), 2) THEN
+            IF RTRIM$(secondarg$) = UCASE$(RTRIM$(ids(i).secondargmustbe)) THEN
+            ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargmustbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) = UCASE$(MID$(RTRIM$(ids(i).secondargmustbe), 2)) THEN
             ELSE
                 GOTO findidnomatch
             END IF
         END IF
         IF ASC(ids(i).secondargcantbe) <> 32 THEN 'exists?
-            IF RTRIM$(secondarg$) <> RTRIM$(ids(i).secondargcantbe) THEN
-            ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargcantbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) <> MID$(RTRIM$(ids(i).secondargcantbe), 2) THEN
+            IF RTRIM$(secondarg$) <> UCASE$(RTRIM$(ids(i).secondargcantbe)) THEN
+            ELSEIF qb64prefix_set = 1 AND LEFT$(ids(i).secondargcantbe, 1) = "_" AND LEFT$(secondarg$, 1) <> "_" AND RTRIM$(secondarg$) <> UCASE$(MID$(RTRIM$(ids(i).secondargcantbe), 2)) THEN
             ELSE
                 GOTO findidnomatch
             END IF
@@ -18386,8 +18423,8 @@ FUNCTION fixoperationorder$ (savea$)
                     IF b = 0 THEN
                         IF UCASE$(a2$) = "NOT" THEN
                             IF i = n THEN Give_Error "Expected NOT ...": EXIT FUNCTION
-                            IF i = 1 THEN a$ = "NOT" + sp + "{" + sp + getelements$(a$, 2, n) + sp + "}": n = n + 2: GOTO lco_bracketting_done
-                            a$ = getelements$(a$, 1, i - 1) + sp + "{" + sp + "NOT" + sp + "{" + sp + getelements$(a$, i + 1, n) + sp + "}" + sp + "}"
+                            IF i = 1 THEN a$ = SCase$("Not") + sp + "{" + sp + getelements$(a$, 2, n) + sp + "}": n = n + 2: GOTO lco_bracketting_done
+                            a$ = getelements$(a$, 1, i - 1) + sp + "{" + sp + SCase$("Not") + sp + "{" + sp + getelements$(a$, i + 1, n) + sp + "}" + sp + "}"
                             n = n + 4
                             GOTO NOT_recheck
                         END IF 'not
@@ -18784,7 +18821,11 @@ FUNCTION fixoperationorder$ (savea$)
                                     f3$ = f2$
                                     s$ = removesymbol$(f3$)
                                     IF Error_Happened THEN EXIT FUNCTION
-                                    f2$ = RTRIM$(id.cn) + s$
+                                    IF id.internal_subfunc THEN
+                                        f2$ = SCase$(RTRIM$(id.cn)) + s$
+                                    ELSE
+                                        f2$ = RTRIM$(id.cn) + s$
+                                    END IF
                                     removeelements a$, i, i, 0
                                     insertelements a$, i - 1, UCASE$(f2$)
                                     f$ = f$ + f2$ + sp + "(" + sp
@@ -18823,7 +18864,11 @@ FUNCTION fixoperationorder$ (savea$)
                                         'check if next item is a period
 
                                         'correct name
-                                        f2$ = RTRIM$(id.cn) + removesymbol$(f2$)
+                                        IF id.internal_subfunc THEN
+                                            f2$ = SCase$(RTRIM$(id.cn)) + removesymbol$(f2$)
+                                        ELSE
+                                            f2$ = RTRIM$(id.cn) + removesymbol$(f2$)
+                                        END IF
                                         IF Error_Happened THEN EXIT FUNCTION
                                         removeelements a$, i, i, 0
                                         insertelements a$, i - 1, UCASE$(f2$)
@@ -18882,7 +18927,11 @@ FUNCTION fixoperationorder$ (savea$)
                                     f3$ = f2$
                                     s$ = removesymbol$(f3$)
                                     IF Error_Happened THEN EXIT FUNCTION
-                                    f2$ = RTRIM$(id.cn) + s$
+                                    IF id.internal_subfunc THEN
+                                        f2$ = SCase$(RTRIM$(id.cn)) + s$
+                                    ELSE
+                                        f2$ = RTRIM$(id.cn) + s$
+                                    END IF
                                     'change was is returned to uppercase
                                     removeelements a$, i, i, 0
                                     insertelements a$, i - 1, UCASE$(f2$)
@@ -18913,7 +18962,7 @@ FUNCTION fixoperationorder$ (savea$)
                 IF f3$ = "_FLOAT" OR (f3$ = "FLOAT" AND qb64prefix_set = 1) THEN internaltype = 1
                 IF f3$ = "_OFFSET" OR (f3$ = "OFFSET" AND qb64prefix_set = 1) THEN internaltype = 1
                 IF internaltype = 1 THEN
-                    f2$ = f3$
+                    f2$ = SCase2$(f3$)
                     removeelements a$, i, i, 0
                     insertelements a$, i - 1, f3$
                     GOTO classdone
@@ -19923,7 +19972,7 @@ FUNCTION lineformat$ (a$)
 
                     'note: In QBASIC 'IF cond THEN REM comment' counts as a single line IF statement, however use of ' instead of REM does not
                     IF UCASE$(RIGHT$(a2$, 5)) = sp + "THEN" THEN a2$ = a2$ + sp + "'" 'add nop
-                    layoutcomment = "REM"
+                    layoutcomment = SCase$("Rem")
                     GOTO comment
                 END IF
             END IF
@@ -21339,8 +21388,8 @@ FUNCTION seperateargs (a$, ca$, pass&)
                                         c$ = c$ + " " + getelement$(a$, i3 + w - 1)
                                     NEXT w
                                     'Compare
-                                    noPrefixMatch = LEFT$(Opt(x, o), 1) = "_" AND qb64prefix_set = 1 AND c$ = MID$(RTRIM$(Opt(x, o)), 2)
-                                    IF c$ = RTRIM$(Opt(x, o)) OR noPrefixMatch THEN
+                                    noPrefixMatch = LEFT$(Opt(x, o), 1) = "_" AND qb64prefix_set = 1 AND c$ = UCASE$(MID$(RTRIM$(Opt(x, o)), 2))
+                                    IF c$ = UCASE$(RTRIM$(Opt(x, o))) OR noPrefixMatch THEN
                                         'Record Match
                                         IF i3 < position THEN
                                             position = i3
@@ -21388,7 +21437,7 @@ FUNCTION seperateargs (a$, ca$, pass&)
                         END IF
                     END IF 'Expression
                     i = i + OptWords(x, which)
-                    separgslayout(x) = CHR$(LEN(RTRIM$(Opt(x, which))) - removePrefix) + MID$(RTRIM$(Opt(x, which)), removePrefix + 1)
+                    separgslayout(x) = CHR$(LEN(RTRIM$(Opt(x, which))) - removePrefix) + SCase$(MID$(RTRIM$(Opt(x, which)), removePrefix + 1))
                     separgs(x) = CHR$(0) + str2(which)
                 ELSE
                     'Not Found...
@@ -22291,7 +22340,7 @@ SUB xfileprint (a$, ca$, n)
     printgotfn:
     e$ = fixoperationorder$(a3$)
     IF Error_Happened THEN EXIT SUB
-    l$ = "PRINT" + sp + "#" + sp2 + tlayout$ + sp2 + ","
+    l$ = SCase$("Print") + sp + "#" + sp2 + tlayout$ + sp2 + ","
     e$ = evaluatetotyp(e$, 64&)
     IF Error_Happened THEN EXIT SUB
     PRINT #12, "tab_fileno=tmp_fileno=" + e$ + ";"
@@ -22303,7 +22352,7 @@ SUB xfileprint (a$, ca$, n)
         IF getelement(a$, i) = "USING" THEN
             'get format string
             fpujump:
-            l$ = l$ + sp + "USING"
+            l$ = l$ + sp + SCase$("Using")
             e$ = "": b = 0: puformat$ = ""
             FOR i = i + 1 TO n
                 a2$ = getelement(ca$, i)
@@ -22494,7 +22543,7 @@ SUB xfileprint (a$, ca$, n)
 END SUB
 
 SUB xfilewrite (ca$, n)
-    l$ = "WRITE" + sp + "#"
+    l$ = SCase$("Write") + sp + "#"
     u$ = str2$(uniquenumber)
     PRINT #12, "tab_spc_cr_size=2;"
     IF n = 2 THEN Give_Error "Expected # ...": EXIT SUB
@@ -22610,7 +22659,7 @@ SUB xgosub (ca$)
         Labels(r).Error_Line = linenumber
     END IF 'x
 
-    l$ = "GOSUB" + sp + tlayout$
+    l$ = SCase$("GoSub") + sp + tlayout$
     layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$
     'note: This code fragment also used by ON ... GOTO/GOSUB
     'assume label is reachable (revise)
@@ -22627,7 +22676,7 @@ END SUB
 
 SUB xongotogosub (a$, ca$, n)
     IF n < 4 THEN Give_Error "Expected ON expression GOTO/GOSUB label,label,...": EXIT SUB
-    l$ = "ON"
+    l$ = SCase$("On")
     b = 0
     FOR i = 2 TO n
         e2$ = getelement$(a$, i)
@@ -22723,8 +22772,8 @@ END SUB
 SUB xprint (a$, ca$, n)
     u$ = str2$(uniquenumber)
 
-    l$ = "PRINT"
-    IF ASC(a$) = 76 THEN lp = 1: lp$ = "l": l$ = "LPRINT": PRINT #12, "tab_LPRINT=1;": DEPENDENCY(DEPENDENCY_PRINTER) = 1 '"L"
+    l$ = SCase$("Print")
+    IF ASC(a$) = 76 THEN lp = 1: lp$ = "l": l$ = SCase$("LPrint"): PRINT #12, "tab_LPRINT=1;": DEPENDENCY(DEPENDENCY_PRINTER) = 1 '"L"
 
     'PRINT USING?
     IF n >= 2 THEN
@@ -22732,7 +22781,7 @@ SUB xprint (a$, ca$, n)
             'get format string
             i = 3
             pujump:
-            l$ = l$ + sp + "USING"
+            l$ = l$ + sp + SCase$("Using")
             e$ = "": b = 0: puformat$ = ""
             FOR i = i TO n
                 a2$ = getelement(ca$, i)
@@ -22938,7 +22987,7 @@ END SUB
 
 
 SUB xread (ca$, n)
-    l$ = "READ"
+    l$ = SCase$("Read")
     IF n = 1 THEN Give_Error "Expected variable": EXIT SUB
     i = 2
     IF i > n THEN Give_Error "Expected , ...": EXIT SUB
@@ -22995,7 +23044,7 @@ SUB xread (ca$, n)
 END SUB
 
 SUB xwrite (ca$, n)
-    l$ = "WRITE"
+    l$ = SCase$("Write")
     u$ = str2$(uniquenumber)
     IF n = 1 THEN
         PRINT #12, "qbs_print(nothingstring,1);"
@@ -25544,6 +25593,39 @@ SUB addWarning (whichLineNumber AS LONG, includeLevel AS LONG, incLineNumber AS
     RETURN
 END SUB
 
+FUNCTION SCase$ (t$)
+    IF ideautolayoutkwcapitals THEN SCase$ = UCASE$(t$) ELSE SCase$ = t$
+END FUNCTION
+
+FUNCTION SCase2$ (t$)
+    separator$ = sp
+    IF ideautolayoutkwcapitals THEN
+        SCase2$ = UCASE$(t$)
+    ELSE
+        newWord = -1
+        temp$ = ""
+        FOR i = 1 TO LEN(t$)
+            s$ = MID$(t$, i, 1)
+            IF newWord THEN
+                IF s$ = "_" OR s$ = separator$ THEN
+                    temp$ = temp$ + s$
+                ELSE
+                    temp$ = temp$ + UCASE$(s$)
+                    newWord = 0
+                END IF
+            ELSE
+                IF s$ = separator$ THEN
+                    temp$ = temp$ + separator$
+                    newWord = -1
+                ELSE
+                    temp$ = temp$ + LCASE$(s$)
+                END IF
+            END IF
+        NEXT
+        SCase2$ = temp$
+    END IF
+END FUNCTION
+
 '$INCLUDE:'utilities\strings.bas'
 
 '$INCLUDE:'subs_functions\extensions\opengl\opengl_methods.bas'
diff --git a/source/subs_functions/subs_functions.bas b/source/subs_functions/subs_functions.bas
index 08cd75f96..148d96dd6 100644
--- a/source/subs_functions/subs_functions.bas
+++ b/source/subs_functions/subs_functions.bas
@@ -26,103 +26,103 @@
 
 'stubs for internally handled commands:
 clearid
-id.n = "ASC": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Asc": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "ASC": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Asc": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "END": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "End": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "LSET": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "LSet": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "RSET": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "RSet": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "MID": id.subfunc = 2: id.callname = "sub_stub": id.musthave = "$": regid
+id.n = "Mid": id.subfunc = 2: id.callname = "sub_stub": id.musthave = "$": regid
 clearid
-id.n = "PRINT": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Print": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "OPTION": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Option": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "SWAP": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Swap": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "SYSTEM": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "System": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "WRITE": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Write": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "READ": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Read": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "CLOSE": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Close": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "RESET": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Reset": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "INPUT": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "Input": id.subfunc = 2: id.callname = "sub_stub": regid
 'stubs for unimplemented commands:
 clearid
-id.n = "TRON": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "TrOn": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "TROFF": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "TrOff": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "LIST": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "List": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "DEF": id.subfunc = 2: id.callname = "sub_stub": id.secondargcantbe = "SEG": regid
+id.n = "Def": id.subfunc = 2: id.callname = "sub_stub": id.secondargcantbe = "SEG": regid
 clearid
-id.n = "IOCTL": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = "IoCtl": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = "IOCTL": id.subfunc = 1: id.callname = "func_stub": id.musthave = "$": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = STRINGTYPE - ISPOINTER: regid
+id.n = "IoCtl": id.subfunc = 1: id.callname = "func_stub": id.musthave = "$": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = STRINGTYPE - ISPOINTER: regid
 clearid
-id.n = "FRE": id.subfunc = 1: id.callname = "func_stub": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
+id.n = "Fre": id.subfunc = 1: id.callname = "func_stub": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
 clearid
-id.n = "SETMEM": id.subfunc = 1: id.callname = "func_stub": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
+id.n = "SetMem": id.subfunc = 1: id.callname = "func_stub": id.args = 1: id.arg = MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
 clearid
-id.n = "FILEATTR": id.subfunc = 1: id.callname = "func_stub": id.args = 2: id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
+id.n = "FileAttr": id.subfunc = 1: id.callname = "func_stub": id.args = 2: id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER): id.ret = LONGTYPE - ISPOINTER: regid
 clearid
-id.n = qb64prefix$ + "MEMGET": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = qb64prefix$ + "MemGet": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = qb64prefix$ + "MEMPUT": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = qb64prefix$ + "MemPut": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = qb64prefix$ + "MEMFILL": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = qb64prefix$ + "MemFill": id.subfunc = 2: id.callname = "sub_stub": regid
 clearid
-id.n = qb64prefix$ + "CONTINUE": id.subfunc = 2: id.callname = "sub_stub": regid
+id.n = qb64prefix$ + "Continue": id.subfunc = 2: id.callname = "sub_stub": regid
 
 
 clearid
-id.n = qb64prefix$ + "RESIZE"
+id.n = qb64prefix$ + "Resize"
 id.subfunc = 2
 id.callname = "sub__resize"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{ON|OFF}][,{_STRETCH|_SMOOTH}]"
+id.specialformat = "[{On|Off}][,{_Stretch|_Smooth}]"
 regid
 
 clearid
-id.n = qb64prefix$ + "RESIZE"
+id.n = qb64prefix$ + "Resize"
 id.subfunc = 1
 id.callname = "func__resize"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "RESIZEWIDTH"
+id.n = qb64prefix$ + "ResizeWidth"
 id.subfunc = 1
 id.callname = "func__resizewidth"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "RESIZEHEIGHT"
+id.n = qb64prefix$ + "ResizeHeight"
 id.subfunc = 1
 id.callname = "func__resizeheight"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCALEDWIDTH"
+id.n = qb64prefix$ + "ScaledWidth"
 id.subfunc = 1
 id.callname = "func__scaledwidth"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCALEDHEIGHT"
+id.n = qb64prefix$ + "ScaledHeight"
 id.subfunc = 1
 id.callname = "func__scaledheight"
 id.ret = LONGTYPE - ISPOINTER
@@ -130,25 +130,25 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "GLRENDER"
+id.n = qb64prefix$ + "GLRender"
 id.subfunc = 2
 id.callname = "sub__glrender"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{_BEHIND|_ONTOP|_ONLY}"
+id.specialformat = "{_Behind|_OnTop|_Only}"
 regid
 
 clearid
-id.n = qb64prefix$ + "DISPLAYORDER"
+id.n = qb64prefix$ + "DisplayOrder"
 id.subfunc = 2
 id.callname = "sub__displayorder"
 id.args = 4
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_SOFTWARE|_HARDWARE|_HARDWARE1|_GLRENDER}[,{_SOFTWARE|_HARDWARE|_HARDWARE1|_GLRENDER}[,{_SOFTWARE|_HARDWARE|_HARDWARE1|_GLRENDER}[,{_SOFTWARE|_HARDWARE|_HARDWARE1|_GLRENDER}]]]]"
+id.specialformat = "[{_Software|_Hardware|_Hardware1|_GLRender}[,{_Software|_Hardware|_Hardware1|_GLRender}[,{_Software|_Hardware|_Hardware1|_GLRender}[,{_Software|_Hardware|_Hardware1|_GLRender}]]]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MEMGET"
+id.n = qb64prefix$ + "MemGet"
 id.subfunc = 1
 id.callname = "func__memget"
 id.args = 3
@@ -157,7 +157,7 @@ id.ret = -1
 regid
 
 clearid
-id.n = qb64prefix$ + "MEM"
+id.n = qb64prefix$ + "Mem"
 id.subfunc = 1
 id.callname = "func__mem"
 'id.args = 1
@@ -170,7 +170,7 @@ regid
 '---special case---
 
 clearid
-id.n = qb64prefix$ + "MEMELEMENT"
+id.n = qb64prefix$ + "MemElement"
 id.subfunc = 1
 id.callname = "func__mem"
 id.args = 1
@@ -182,7 +182,7 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "MEMFREE"
+id.n = qb64prefix$ + "MemFree"
 id.subfunc = 2
 id.callname = "sub__memfree"
 id.args = 1
@@ -190,7 +190,7 @@ id.arg = MKL$(UDTTYPE + (1))
 regid
 
 clearid
-id.n = qb64prefix$ + "MEMEXISTS"
+id.n = qb64prefix$ + "MemExists"
 id.subfunc = 1
 id.callname = "func__memexists"
 id.args = 1
@@ -199,7 +199,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "MEMNEW"
+id.n = qb64prefix$ + "MemNew"
 id.subfunc = 1
 id.callname = "func__memnew"
 id.args = 1
@@ -208,7 +208,7 @@ id.ret = ISUDT + (1) 'the _MEM type is the first TYPE defined
 regid
 
 clearid
-id.n = qb64prefix$ + "MEMIMAGE"
+id.n = qb64prefix$ + "MemImage"
 id.subfunc = 1
 id.callname = "func__memimage"
 id.args = 1
@@ -218,7 +218,7 @@ id.ret = ISUDT + (1) 'the _MEM type is the first TYPE defined
 regid
 
 clearid
-id.n = qb64prefix$ + "MEMSOUND": id.Dependency = DEPENDENCY_AUDIO_DECODE
+id.n = qb64prefix$ + "MemSound": id.Dependency = DEPENDENCY_AUDIO_DECODE
 id.subfunc = 1
 id.callname = "func__memsound"
 id.args = 2
@@ -227,16 +227,16 @@ id.ret = ISUDT + (1) 'the _MEM type is the first TYPE defined
 regid
 
 clearid '_MEMCOPY a, aoffset, bytes TO b, boffset
-id.n = qb64prefix$ + "MEMCOPY"
+id.n = qb64prefix$ + "MemCopy"
 id.subfunc = 2
 id.callname = "sub__memcopy"
 id.args = 5
 id.arg = MKL$(UDTTYPE + (1)) + MKL$(OFFSETTYPE - ISPOINTER) + MKL$(OFFSETTYPE - ISPOINTER) + MKL$(UDTTYPE + (1)) + MKL$(OFFSETTYPE - ISPOINTER)
-id.specialformat = "?,?,?{TO}?,?" 'dest is default
+id.specialformat = "?,?,?{To}?,?" 'dest is default
 regid
 
 clearid
-id.n = qb64prefix$ + "CONSOLETITLE"
+id.n = qb64prefix$ + "ConsoleTitle"
 id.subfunc = 2
 id.callname = "sub__consoletitle"
 id.args = 1
@@ -244,19 +244,19 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENSHOW"
+id.n = qb64prefix$ + "ScreenShow"
 id.subfunc = 2
 id.callname = "sub__screenshow"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENHIDE"
+id.n = qb64prefix$ + "ScreenHide"
 id.subfunc = 2
 id.callname = "sub__screenhide"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENHIDE"
+id.n = qb64prefix$ + "ScreenHide"
 id.subfunc = 1
 id.callname = "func__screenhide"
 id.ret = LONGTYPE - ISPOINTER
@@ -264,48 +264,48 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "CONSOLE"
+id.n = qb64prefix$ + "Console"
 id.subfunc = 1
 id.callname = "func__console"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CONSOLE"
+id.n = qb64prefix$ + "Console"
 id.subfunc = 2
 id.callname = "sub__console"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{ON|OFF}"
+id.specialformat = "{On|Off}"
 regid
 
 clearid
-id.n = qb64prefix$ + "CONTROLCHR"
+id.n = qb64prefix$ + "ControlChr"
 id.subfunc = 2
 id.callname = "sub__controlchr"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{ON|OFF}"
+id.specialformat = "{On|Off}"
 regid
 
 clearid
-id.n = qb64prefix$ + "BLINK"
+id.n = qb64prefix$ + "Blink"
 id.subfunc = 2
 id.callname = "sub__blink"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{ON|OFF}"
+id.specialformat = "{On|Off}"
 regid
 
 clearid
-id.n = qb64prefix$ + "BLINK"
+id.n = qb64prefix$ + "Blink"
 id.subfunc = 1
 id.callname = "func__blink"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FILEEXISTS"
+id.n = qb64prefix$ + "FileExists"
 id.subfunc = 1
 id.callname = "func__fileexists"
 id.args = 1
@@ -314,7 +314,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DIREXISTS"
+id.n = qb64prefix$ + "DirExists"
 id.subfunc = 1
 id.callname = "func__direxists"
 id.args = 1
@@ -325,7 +325,7 @@ regid
 'QB64 DEVICE interface
 
 clearid
-id.n = "STICK": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = "Stick": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func_stick"
 id.args = 2
@@ -335,7 +335,7 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = "STRIG": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = "Strig": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func_strig"
 id.args = 2
@@ -345,26 +345,26 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = "STRIG": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = "Strig": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 2
 id.callname = "sub_strig"
 id.args = 3
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[(?[,?])]{ON|OFF|STOP}"
+id.specialformat = "[(?[,?])]{On|Off|Stop}"
 'In previous versions of BASIC, the statement STRIG ON enables testing of the joystick triggers; STRIG OFF disables joystick trigger testing. QuickBASIC ignores STRIG ON and STRIG OFF statements--the statements are provided for compatibility with earlier versions.
 regid
 
 
 
 clearid
-id.n = qb64prefix$ + "DEVICES": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "Devices": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__devices"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DEVICE": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "Device": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__device"
@@ -375,7 +375,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "DEVICEINPUT": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "DeviceInput": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__deviceinput"
 id.args = 1
@@ -385,7 +385,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "LASTBUTTON": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "LastButton": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__lastbutton"
 id.args = 1
@@ -395,7 +395,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "LASTAXIS": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "LastAxis": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__lastaxis"
 id.args = 1
@@ -405,7 +405,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "LASTWHEEL": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "LastWheel": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__lastwheel"
 id.args = 1
@@ -415,7 +415,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "BUTTON": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "Button": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__button"
 id.args = 1
@@ -425,7 +425,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "BUTTONCHANGE": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "ButtonChange": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__buttonchange"
 id.args = 1
@@ -435,7 +435,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "AXIS": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "Axis": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__axis"
 id.args = 1
@@ -446,7 +446,7 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "WHEEL": id.Dependency=DEPENDENCY_DEVICEINPUT
+id.n = qb64prefix$ + "Wheel": id.Dependency=DEPENDENCY_DEVICEINPUT
 id.subfunc = 1
 id.callname = "func__wheel"
 id.args = 1
@@ -465,39 +465,39 @@ regid
 
 
 clearid
-id.n = "KEY"
+id.n = "Key"
 id.subfunc = 2
 id.callname = "sub_key"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "(?){ON|OFF|STOP}"
+id.specialformat = "(?){On|Off|Stop}"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENX"
+id.n = qb64prefix$ + "ScreenX"
 id.subfunc = 1
 id.callname = "func__screenx"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENY"
+id.n = qb64prefix$ + "ScreenY"
 id.subfunc = 1
 id.callname = "func__screeny"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENMOVE"
+id.n = qb64prefix$ + "ScreenMove"
 id.subfunc = 2
 id.callname = "sub__screenmove"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_MIDDLE}][?,?]"
+id.specialformat = "[{_Middle}][?,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEMOVE"
+id.n = qb64prefix$ + "MouseMove"
 id.subfunc = 2
 id.callname = "sub__mousemove"
 id.args = 2
@@ -513,7 +513,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "TITLE"
+id.n = qb64prefix$ + "Title"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__title"
@@ -521,16 +521,16 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "MAPUNICODE"
+id.n = qb64prefix$ + "MapUnicode"
 id.subfunc = 2
 id.callname = "sub__mapunicode"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "?{TO}?"
+id.specialformat = "?{To}?"
 regid
 
 clearid
-id.n = qb64prefix$ + "MAPUNICODE"
+id.n = qb64prefix$ + "MapUnicode"
 id.subfunc = 1
 id.callname = "func__mapunicode"
 id.args = 1
@@ -539,7 +539,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "KEYDOWN"
+id.n = qb64prefix$ + "KeyDown"
 id.subfunc = 1
 id.callname = "func__keydown"
 id.args = 1
@@ -548,21 +548,21 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "KEYHIT"
+id.n = qb64prefix$ + "KeyHit"
 id.subfunc = 1
 id.callname = "func__keyhit"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "WINDOWHANDLE"
+id.n = qb64prefix$ + "WindowHandle"
 id.subfunc = 1
 id.callname = "func__handle"
 id.ret = INTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = "FILES"
+id.n = "Files"
 id.subfunc = 2
 id.callname = "sub_files"
 id.args = 1
@@ -571,7 +571,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "PRINTIMAGE": id.Dependency = DEPENDENCY_PRINTER
+id.n = qb64prefix$ + "PrintImage": id.Dependency = DEPENDENCY_PRINTER
 id.subfunc = 2
 id.callname = "sub__printimage"
 id.args = 1
@@ -583,7 +583,7 @@ regid
 'remote desktop
 
 clearid
-id.n = qb64prefix$ + "SCREENCLICK"
+id.n = qb64prefix$ + "ScreenClick"
 id.subfunc = 2
 id.callname = "sub__screenclick"
 id.args = 3
@@ -592,7 +592,7 @@ id.specialformat = "?,?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENPRINT"
+id.n = qb64prefix$ + "ScreenPrint"
 id.subfunc = 2
 id.callname = "sub__screenprint"
 id.args = 1
@@ -600,7 +600,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENIMAGE": id.Dependency = DEPENDENCY_SCREENIMAGE
+id.n = qb64prefix$ + "ScreenImage": id.Dependency = DEPENDENCY_SCREENIMAGE
 id.subfunc = 1
 id.callname = "func__screenimage"
 id.args = 4
@@ -614,80 +614,80 @@ regid
 
 
 clearid
-id.n = "LOCK"
+id.n = "Lock"
 id.subfunc = 2
 id.callname = "sub_lock"
 id.args = 3
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(INTEGER64TYPE - ISPOINTER) + MKL$(INTEGER64TYPE - ISPOINTER)
-id.specialformat = "[#]?[,[?][{TO}?]]"
+id.specialformat = "[#]?[,[?][{To}?]]"
 regid
 
 clearid
-id.n = "UNLOCK"
+id.n = "Unlock"
 id.subfunc = 2
 id.callname = "sub_unlock"
 id.args = 3
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(INTEGER64TYPE - ISPOINTER) + MKL$(INTEGER64TYPE - ISPOINTER)
-id.specialformat = "[#]?[,[?][{TO}?]]"
+id.specialformat = "[#]?[,[?][{To}?]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "FREETIMER"
+id.n = qb64prefix$ + "FreeTimer"
 id.subfunc = 1
 id.callname = "func__freetimer"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "TIMER"
+id.n = "Timer"
 id.subfunc = 2
 id.callname = "sub_timer"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[(?)]{ON|OFF|STOP|FREE}"
+id.specialformat = "[(?)]{On|Off|Stop|Free}"
 regid
 
 clearid
-id.n = qb64prefix$ + "FULLSCREEN"
+id.n = qb64prefix$ + "FullScreen"
 id.subfunc = 2
 id.callname = "sub__fullscreen"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_OFF|_STRETCH|_SQUAREPIXELS|OFF}][,{_SMOOTH}]"
+id.specialformat = "[{_Off|_Stretch|_SquarePixels|Off}][,{_Smooth}]"
 regid
 
 clearid
-id.n = qb64prefix$ + "ALLOWFULLSCREEN"
+id.n = qb64prefix$ + "AllowFullScreen"
 id.subfunc = 2
 id.callname = "sub__allowfullscreen"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_STRETCH|_SQUAREPIXELS|_OFF|_ALL|OFF}][,{_SMOOTH|_OFF|_ALL|OFF}]"
+id.specialformat = "[{_Stretch|_SquarePixels|_Off|_All|Off}][,{_Smooth|_Off|_All|Off}]"
 regid
 
 clearid
-id.n = qb64prefix$ + "FULLSCREEN"
+id.n = qb64prefix$ + "FullScreen"
 id.subfunc = 1
 id.callname = "func__fullscreen"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SMOOTH"
+id.n = qb64prefix$ + "Smooth"
 id.subfunc = 1
 id.callname = "func__fullscreensmooth"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "WINDOWHASFOCUS"
+id.n = qb64prefix$ + "WindowHasFocus"
 id.subfunc = 1
 id.callname = "func__hasfocus"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CLIPBOARD"
+id.n = qb64prefix$ + "Clipboard"
 id.musthave = "$"
 id.subfunc = 2
 id.callname = "sub__clipboard"
@@ -697,7 +697,7 @@ id.specialformat = "=?"
 regid
 
 clearid
-id.n = qb64prefix$ + "CLIPBOARD"
+id.n = qb64prefix$ + "Clipboard"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__clipboard"
@@ -705,14 +705,14 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CLIPBOARDIMAGE": id.Dependency = DEPENDENCY_SCREENIMAGE
+id.n = qb64prefix$ + "ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE
 id.subfunc = 1
 id.callname = "func__clipboardimage"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CLIPBOARDIMAGE": id.Dependency = DEPENDENCY_SCREENIMAGE
+id.n = qb64prefix$ + "ClipboardImage": id.Dependency = DEPENDENCY_SCREENIMAGE
 id.subfunc = 2
 id.callname = "sub__clipboardimage"
 id.args = 1
@@ -721,14 +721,14 @@ id.specialformat = "=?"
 regid
 
 clearid
-id.n = qb64prefix$ + "EXIT"
+id.n = qb64prefix$ + "Exit"
 id.subfunc = 1
 id.callname = "func__exit"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "OPENHOST": id.Dependency = DEPENDENCY_SOCKETS
+id.n = qb64prefix$ + "OpenHost": id.Dependency = DEPENDENCY_SOCKETS
 id.subfunc = 1
 id.callname = "func__openhost"
 id.args = 1
@@ -737,7 +737,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CONNECTED"
+id.n = qb64prefix$ + "Connected"
 id.subfunc = 1
 id.callname = "func__connected"
 id.args = 1
@@ -746,7 +746,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CONNECTIONADDRESS"
+id.n = qb64prefix$ + "ConnectionAddress"
 id.mayhave = "$"
 id.subfunc = 1
 id.callname = "func__connectionaddress"
@@ -756,7 +756,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "OPENCONNECTION"
+id.n = qb64prefix$ + "OpenConnection"
 id.subfunc = 1
 id.callname = "func__openconnection"
 id.args = 1
@@ -765,7 +765,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "OPENCLIENT": id.Dependency = DEPENDENCY_SOCKETS
+id.n = qb64prefix$ + "OpenClient": id.Dependency = DEPENDENCY_SOCKETS
 id.subfunc = 1
 id.callname = "func__openclient"
 id.args = 1
@@ -775,7 +775,7 @@ regid
 
 
 clearid
-id.n = "ENVIRON"
+id.n = "Environ"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_environ"
@@ -785,7 +785,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "ENVIRON"
+id.n = "Environ"
 id.subfunc = 2
 id.callname = "sub_environ"
 id.args = 1
@@ -793,21 +793,21 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "ERRORLINE"
+id.n = qb64prefix$ + "ErrorLine"
 id.subfunc = 1
 id.callname = "func__errorline"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "INCLERRORLINE"
+id.n = qb64prefix$ + "InclErrorLine"
 id.subfunc = 1
 id.callname = "func__inclerrorline"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ERRORMESSAGE"
+id.n = qb64prefix$ + "ErrorMessage"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__errormessage"
@@ -818,7 +818,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ASSERT"
+id.n = qb64prefix$ + "Assert"
 id.subfunc = 2
 id.callname = "sub__assert"
 id.args = 2
@@ -827,19 +827,19 @@ id.arg = MKL$(INTEGERTYPE - ISPOINTER) + MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "DISPLAY"
+id.n = qb64prefix$ + "Display"
 id.subfunc = 2
 id.callname = "sub__display"
 regid
 
 clearid
-id.n = qb64prefix$ + "AUTODISPLAY"
+id.n = qb64prefix$ + "AutoDisplay"
 id.subfunc = 2
 id.callname = "sub__autodisplay"
 regid
 
 clearid
-id.n = qb64prefix$ + "LIMIT"
+id.n = qb64prefix$ + "Limit"
 id.subfunc = 2
 id.callname = "sub__limit"
 id.args = 1
@@ -852,11 +852,11 @@ id.subfunc = 2
 id.callname = "sub__fps"
 id.args = 1
 id.arg = MKL$(DOUBLETYPE - ISPOINTER)
-id.specialformat = "[{_AUTO}][?]"
+id.specialformat = "[{_Auto}][?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "DELAY"
+id.n = qb64prefix$ + "Delay"
 id.subfunc = 2
 id.callname = "sub__delay"
 id.args = 1
@@ -864,7 +864,7 @@ id.arg = MKL$(DOUBLETYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "ICON": id.Dependency = DEPENDENCY_ICON
+id.n = qb64prefix$ + "Icon": id.Dependency = DEPENDENCY_ICON
 id.subfunc = 2
 id.callname = "sub__icon"
 id.args = 2
@@ -873,7 +873,7 @@ id.specialformat = "[?[,?]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "TITLE"
+id.n = qb64prefix$ + "Title"
 id.subfunc = 2
 id.callname = "sub__title"
 id.args = 1
@@ -881,7 +881,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "ECHO"
+id.n = qb64prefix$ + "Echo"
 id.subfunc = 2
 id.callname = "sub__echo"
 id.args = 1
@@ -889,36 +889,36 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "ACCEPTFILEDROP"
+id.n = qb64prefix$ + "AcceptFileDrop"
 id.subfunc = 2
 id.callname = "sub__filedrop"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{ON|OFF}]"
+id.specialformat = "[{On|Off}]"
 regid
 
 clearid
-id.n = qb64prefix$ + "ACCEPTFILEDROP"
+id.n = qb64prefix$ + "AcceptFileDrop"
 id.subfunc = 1
 id.callname = "func__filedrop"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FINISHDROP"
+id.n = qb64prefix$ + "FinishDrop"
 id.subfunc = 2
 id.callname = "sub__finishdrop"
 regid
 
 clearid
-id.n = qb64prefix$ + "TOTALDROPPEDFILES"
+id.n = qb64prefix$ + "TotalDroppedFiles"
 id.subfunc = 1
 id.callname = "func__totaldroppedfiles"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DROPPEDFILE"
+id.n = qb64prefix$ + "DroppedFile"
 id.mayhave = "$"
 id.subfunc = 1
 id.callname = "func__droppedfile"
@@ -929,7 +929,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = "CLEAR"
+id.n = "Clear"
 id.subfunc = 2
 id.callname = "sub_clear"
 id.args = 3
@@ -940,7 +940,7 @@ regid
 'IMAGE CREATION/FREEING
 
 clearid
-id.n = qb64prefix$ + "NEWIMAGE"
+id.n = qb64prefix$ + "NewImage"
 id.subfunc = 1
 id.callname = "func__newimage"
 id.args = 3
@@ -950,7 +950,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "LOADIMAGE": id.Dependency = DEPENDENCY_IMAGE_CODEC
+id.n = qb64prefix$ + "LoadImage": id.Dependency = DEPENDENCY_IMAGE_CODEC
 id.subfunc = 1
 id.callname = "func__loadimage"
 id.args = 2
@@ -960,7 +960,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FREEIMAGE"
+id.n = qb64prefix$ + "FreeImage"
 id.subfunc = 2
 id.callname = "sub__freeimage"
 id.args = 1
@@ -969,7 +969,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "COPYIMAGE"
+id.n = qb64prefix$ + "CopyImage"
 id.subfunc = 1
 id.callname = "func__copyimage"
 id.args = 2
@@ -981,7 +981,7 @@ regid
 'IMAGE SELECTION
 
 clearid
-id.n = qb64prefix$ + "SOURCE"
+id.n = qb64prefix$ + "Source"
 id.subfunc = 2
 id.callname = "sub__source"
 id.args = 1
@@ -990,7 +990,7 @@ id.specialformat = "?"
 regid
 
 clearid
-id.n = qb64prefix$ + "DEST"
+id.n = qb64prefix$ + "Dest"
 id.subfunc = 2
 id.callname = "sub__dest"
 id.args = 1
@@ -999,21 +999,21 @@ id.specialformat = "?"
 regid
 
 clearid
-id.n = qb64prefix$ + "SOURCE"
+id.n = qb64prefix$ + "Source"
 id.subfunc = 1
 id.callname = "func__source"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DEST"
+id.n = qb64prefix$ + "Dest"
 id.subfunc = 1
 id.callname = "func__dest"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DISPLAY"
+id.n = qb64prefix$ + "Display"
 id.subfunc = 1
 id.callname = "func__display"
 id.ret = LONGTYPE - ISPOINTER
@@ -1022,7 +1022,7 @@ regid
 'IMAGE SETTINGS
 
 clearid
-id.n = qb64prefix$ + "BLEND"
+id.n = qb64prefix$ + "Blend"
 id.subfunc = 2
 id.callname = "sub__blend"
 id.args = 1
@@ -1031,7 +1031,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "DONTBLEND"
+id.n = qb64prefix$ + "DontBlend"
 id.subfunc = 2
 id.callname = "sub__dontblend"
 id.args = 1
@@ -1040,56 +1040,56 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "CLEARCOLOR"
+id.n = qb64prefix$ + "ClearColor"
 id.subfunc = 2
 id.callname = "sub__clearcolor"
 id.args = 2
 id.arg = MKL$(ULONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_NONE}][?][,?]"
+id.specialformat = "[{_None}][?][,?]"
 regid
 
 'USING/CHANGING A SURFACE
 
 clearid
-id.n = qb64prefix$ + "PUTIMAGE"
+id.n = qb64prefix$ + "PutImage"
 id.subfunc = 2
 id.callname = "sub__putimage"
 id.args = 10
 id.arg = MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER)
-id.specialformat = "[[{STEP}](?,?)[-[{STEP}](?,?)]][,[?][,[?][,[[{STEP}](?,?)[-[{STEP}](?,?)]][,{_SMOOTH}]]]]"
+id.specialformat = "[[{Step}](?,?)[-[{Step}](?,?)]][,[?][,[?][,[[{Step}](?,?)[-[{Step}](?,?)]][,{_Smooth}]]]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MAPTRIANGLE"
+id.n = qb64prefix$ + "MapTriangle"
 id.subfunc = 2
 id.callname = "sub__maptriangle"
 id.args = 19
 id.arg = MKL$(LONGTYPE - ISPOINTER)+MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(SINGLETYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_CLOCKWISE|_ANTICLOCKWISE}][{_SEAMLESS}](?,?)-(?,?)-(?,?)[,?]{TO}(?,?[,?])-(?,?[,?])-(?,?[,?])[,[?][,{_SMOOTH|_SMOOTHSHRUNK|_SMOOTHSTRETCHED}]]"
+id.specialformat = "[{_Clockwise|_AntiClockwise}][{_Seamless}](?,?)-(?,?)-(?,?)[,?]{To}(?,?[,?])-(?,?[,?])-(?,?[,?])[,[?][,{_Smooth|_SmoothShrunk|_SmoothStretched}]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "DEPTHBUFFER"
+id.n = qb64prefix$ + "DepthBuffer"
 id.subfunc = 2
 id.callname = "sub__depthbuffer"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER)+MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{ON|OFF|LOCK|_CLEAR}[,?]"
+id.specialformat = "{On|Off|Lock|_Clear}[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SETALPHA"
+id.n = qb64prefix$ + "SetAlpha"
 id.subfunc = 2
 id.callname = "sub__setalpha"
 id.args = 4
 id.arg = MKL$(ULONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "?[,[?[{TO}?]][,?]]"
+id.specialformat = "?[,[?[{To}?]][,?]]"
 regid
 
 'IMAGE INFO
 
 clearid
-id.n = qb64prefix$ + "WIDTH"
+id.n = qb64prefix$ + "Width"
 id.subfunc = 1
 id.callname = "func__width"
 id.args = 1
@@ -1099,7 +1099,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "HEIGHT"
+id.n = qb64prefix$ + "Height"
 id.subfunc = 1
 id.callname = "func__height"
 id.args = 1
@@ -1109,7 +1109,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "PIXELSIZE"
+id.n = qb64prefix$ + "PixelSize"
 id.subfunc = 1
 id.callname = "func__pixelsize"
 id.args = 1
@@ -1119,7 +1119,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CLEARCOLOR"
+id.n = qb64prefix$ + "ClearColor"
 id.subfunc = 1
 id.callname = "func__clearcolor"
 id.args = 1
@@ -1129,7 +1129,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "BLEND"
+id.n = qb64prefix$ + "Blend"
 id.subfunc = 1
 id.callname = "func__blend"
 id.args = 1
@@ -1139,7 +1139,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DEFAULTCOLOR"
+id.n = qb64prefix$ + "DefaultColor"
 id.subfunc = 1
 id.callname = "func__defaultcolor"
 id.args = 1
@@ -1149,7 +1149,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "BACKGROUNDCOLOR"
+id.n = qb64prefix$ + "BackgroundColor"
 id.subfunc = 1
 id.callname = "func__backgroundcolor"
 id.args = 1
@@ -1161,7 +1161,7 @@ regid
 '256 COLOR PALETTES
 
 clearid
-id.n = qb64prefix$ + "PALETTECOLOR"
+id.n = qb64prefix$ + "PaletteColor"
 id.subfunc = 1
 id.callname = "func__palettecolor"
 id.args = 2
@@ -1171,7 +1171,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "PALETTECOLOR"
+id.n = qb64prefix$ + "PaletteColor"
 id.subfunc = 2
 id.callname = "sub__palettecolor"
 id.args = 3
@@ -1180,7 +1180,7 @@ id.specialformat = "?,?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "COPYPALETTE"
+id.n = qb64prefix$ + "CopyPalette"
 id.subfunc = 2
 id.callname = "sub__copypalette"
 id.args = 2
@@ -1191,7 +1191,7 @@ regid
 'FONT SUPPORT
 
 clearid
-id.n = qb64prefix$ + "LOADFONT": id.Dependency = DEPENDENCY_LOADFONT
+id.n = qb64prefix$ + "LoadFont": id.Dependency = DEPENDENCY_LOADFONT
 id.subfunc = 1
 id.callname = "func__loadfont"
 id.args = 3
@@ -1201,7 +1201,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FONT"
+id.n = qb64prefix$ + "Font"
 id.subfunc = 2
 id.callname = "sub__font"
 id.args = 2
@@ -1210,7 +1210,7 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "FONTWIDTH"
+id.n = qb64prefix$ + "FontWidth"
 id.subfunc = 1
 id.callname = "func__fontwidth"
 id.args = 1
@@ -1220,7 +1220,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FONTHEIGHT"
+id.n = qb64prefix$ + "FontHeight"
 id.subfunc = 1
 id.callname = "func__fontheight"
 id.args = 1
@@ -1230,7 +1230,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FONT"
+id.n = qb64prefix$ + "Font"
 id.subfunc = 1
 id.callname = "func__font"
 id.args = 1
@@ -1240,16 +1240,16 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "PRINTSTRING"
+id.n = qb64prefix$ + "PrintString"
 id.subfunc = 2
 id.callname = "sub__printstring"
 id.args = 4
 id.arg = MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER) + MKL$(STRINGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?),?[,?]"
+id.specialformat = "[{Step}](?,?),?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "PRINTWIDTH"
+id.n = qb64prefix$ + "PrintWidth"
 id.subfunc = 1
 id.callname = "func__printwidth"
 id.args = 2
@@ -1259,7 +1259,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "FREEFONT"
+id.n = qb64prefix$ + "FreeFont"
 id.subfunc = 2
 id.callname = "sub__freefont"
 id.args = 1
@@ -1268,16 +1268,16 @@ id.specialformat = "?"
 regid
 
 clearid
-id.n = qb64prefix$ + "PRINTMODE"
+id.n = qb64prefix$ + "PrintMode"
 id.subfunc = 2
 id.callname = "sub__printmode"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{_FILLBACKGROUND|_KEEPBACKGROUND|_ONLYBACKGROUND}[,?]"
+id.specialformat = "{_FillBackground|_KeepBackground|_OnlyBackground}[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "PRINTMODE"
+id.n = qb64prefix$ + "PrintMode"
 id.subfunc = 1
 id.callname = "func__printmode"
 id.args = 1
@@ -1309,7 +1309,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "RED"
+id.n = qb64prefix$ + "Red"
 id.subfunc = 1
 id.callname = "func__red"
 id.args = 2
@@ -1319,7 +1319,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "GREEN"
+id.n = qb64prefix$ + "Green"
 id.subfunc = 1
 id.callname = "func__green"
 id.args = 2
@@ -1329,7 +1329,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "BLUE"
+id.n = qb64prefix$ + "Blue"
 id.subfunc = 1
 id.callname = "func__blue"
 id.args = 2
@@ -1339,7 +1339,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ALPHA"
+id.n = qb64prefix$ + "Alpha"
 id.subfunc = 1
 id.callname = "func__alpha"
 id.args = 2
@@ -1369,7 +1369,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "RED32"
+id.n = qb64prefix$ + "Red32"
 id.subfunc = 1
 id.callname = "func__red32"
 id.args = 1
@@ -1378,7 +1378,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "GREEN32"
+id.n = qb64prefix$ + "Green32"
 id.subfunc = 1
 id.callname = "func__green32"
 id.args = 1
@@ -1387,7 +1387,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "BLUE32"
+id.n = qb64prefix$ + "Blue32"
 id.subfunc = 1
 id.callname = "func__blue32"
 id.args = 1
@@ -1396,7 +1396,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ALPHA32"
+id.n = qb64prefix$ + "Alpha32"
 id.subfunc = 1
 id.callname = "func__alpha32"
 id.args = 1
@@ -1406,7 +1406,7 @@ regid
 
 
 clearid
-id.n = "DRAW"
+id.n = "Draw"
 id.subfunc = 2
 id.callname = "sub_draw"
 id.args = 1
@@ -1414,7 +1414,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "PLAY": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = "Play": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub_play"
 id.args = 1
@@ -1422,7 +1422,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "PLAY": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = "Play": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func_play"
 id.args = 1
@@ -1432,7 +1432,7 @@ regid
 
 'QB64 MOUSE
 clearid
-id.n = qb64prefix$ + "MOUSESHOW"
+id.n = qb64prefix$ + "MouseShow"
 id.subfunc = 2
 id.callname = "sub__mouseshow"
 id.args = 1
@@ -1441,13 +1441,13 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEHIDE"
+id.n = qb64prefix$ + "MouseHide"
 id.subfunc = 2
 id.callname = "sub__mousehide"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEINPUT"
+id.n = qb64prefix$ + "MouseInput"
 id.subfunc = 1
 id.callname = "func__mouseinput"
 id.ret = LONGTYPE - ISPOINTER
@@ -1457,7 +1457,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEX"
+id.n = qb64prefix$ + "MouseX"
 id.subfunc = 1
 id.callname = "func__mousex"
 id.ret = SINGLETYPE - ISPOINTER
@@ -1467,7 +1467,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEY"
+id.n = qb64prefix$ + "MouseY"
 id.subfunc = 1
 id.callname = "func__mousey"
 id.ret = SINGLETYPE - ISPOINTER
@@ -1477,7 +1477,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEMOVEMENTX"
+id.n = qb64prefix$ + "MouseMovementX"
 id.subfunc = 1
 id.callname = "func__mousemovementx"
 id.ret = SINGLETYPE - ISPOINTER
@@ -1487,7 +1487,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEMOVEMENTY"
+id.n = qb64prefix$ + "MouseMovementY"
 id.subfunc = 1
 id.callname = "func__mousemovementy"
 id.ret = SINGLETYPE - ISPOINTER
@@ -1497,7 +1497,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEBUTTON"
+id.n = qb64prefix$ + "MouseButton"
 id.subfunc = 1
 id.callname = "func__mousebutton"
 id.args = 2
@@ -1507,7 +1507,7 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEWHEEL"
+id.n = qb64prefix$ + "MouseWheel"
 id.subfunc = 1
 id.callname = "func__mousewheel"
 id.ret = LONGTYPE - ISPOINTER
@@ -1518,14 +1518,14 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "MOUSEPIPEOPEN"
+id.n = qb64prefix$ + "MousePipeOpen"
 id.subfunc = 1
 id.callname = "func__mousepipeopen"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEINPUTPIPE"
+id.n = qb64prefix$ + "MouseInputPipe"
 id.subfunc = 2
 id.callname = "sub__mouseinputpipe"
 id.args = 1
@@ -1533,7 +1533,7 @@ id.arg = MKL$(LONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "MOUSEPIPECLOSE"
+id.n = qb64prefix$ + "MousePipeClose"
 id.subfunc = 2
 id.callname = "sub__mousepipeclose"
 id.args = 1
@@ -1541,23 +1541,23 @@ id.arg = MKL$(LONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "FREEFILE"
+id.n = "FreeFile"
 id.subfunc = 1
 id.callname = "func_freefile"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "NAME"
+id.n = "Name"
 id.subfunc = 2
 id.callname = "sub_name"
 id.args = 2
 id.arg = MKL$(STRINGTYPE - ISPOINTER) + MKL$(STRINGTYPE - ISPOINTER)
-id.specialformat = "?{AS}?"
+id.specialformat = "?{As}?"
 regid
 
 clearid
-id.n = "KILL"
+id.n = "Kill"
 id.subfunc = 2
 id.callname = "sub_kill"
 id.args = 1
@@ -1565,7 +1565,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "CHDIR"
+id.n = "ChDir"
 id.subfunc = 2
 id.callname = "sub_chdir"
 id.args = 1
@@ -1573,7 +1573,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "MKDIR"
+id.n = "MkDir"
 id.subfunc = 2
 id.callname = "sub_mkdir"
 id.args = 1
@@ -1581,7 +1581,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "RMDIR"
+id.n = "RmDir"
 id.subfunc = 2
 id.callname = "sub_rmdir"
 id.args = 1
@@ -1589,7 +1589,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "CHAIN"
+id.n = "Chain"
 id.subfunc = 2
 id.callname = "sub_chain"
 id.args = 1
@@ -1597,7 +1597,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "SHELL"
+id.n = "Shell"
 id.subfunc = 2
 id.callname = "sub_shell"
 id.args = 1
@@ -1607,27 +1607,27 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = "SHELL"
+id.n = "Shell"
 id.subfunc = 2
 id.callname = "sub_shell2"
 id.args = 1
 id.arg = MKL$(STRINGTYPE - ISPOINTER)
-id.specialformat = "{_HIDE}[{_DONTWAIT}][?]"
-id.secondargmustbe = "_HIDE"
+id.specialformat = "{_Hide}[{_DontWait}][?]"
+id.secondargmustbe = "_Hide"
 regid
 
 clearid
-id.n = "SHELL"
+id.n = "Shell"
 id.subfunc = 2
 id.callname = "sub_shell3"
 id.args = 1
 id.arg = MKL$(STRINGTYPE - ISPOINTER)
-id.specialformat = "{_DONTWAIT}[{_HIDE}][?]"
-id.secondargmustbe = "_DONTWAIT"
+id.specialformat = "{_DontWait}[{_Hide}][?]"
+id.secondargmustbe = "_DontWait"
 regid
 
 clearid
-id.n = "SHELL"
+id.n = "Shell"
 id.subfunc = 1
 id.callname = "func_shell"
 id.args = 1
@@ -1636,7 +1636,7 @@ id.ret = INTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SHELLHIDE"
+id.n = qb64prefix$ + "ShellHide"
 id.subfunc = 1
 id.callname = "func__shellhide"
 id.args = 1
@@ -1645,7 +1645,7 @@ id.ret = INTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = "COMMAND"
+id.n = "Command"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_command"
@@ -1656,7 +1656,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "COMMANDCOUNT"
+id.n = qb64prefix$ + "CommandCount"
 id.subfunc = 1
 id.callname = "func__commandcount"
 id.ret = LONGTYPE - ISPOINTER
@@ -1666,14 +1666,14 @@ regid
 'QB64 AUDIO
 
 clearid
-id.n = qb64prefix$ + "SNDRATE": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndRate": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndrate"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDRAW": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndRaw": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndraw"
 id.args = 3
@@ -1682,7 +1682,7 @@ id.specialformat = "?[,[?][,?]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDRAWDONE": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndRawDone": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndrawdone"
 id.args = 1
@@ -1691,14 +1691,14 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDOPENRAW": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndOpenRaw": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndopenraw"
 id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDRAWLEN": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndRawLen": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndrawlen"
 id.args = 1
@@ -1708,7 +1708,7 @@ id.ret = DOUBLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDLEN": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndLen": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndlen"
 id.args = 1
@@ -1717,7 +1717,7 @@ id.ret = SINGLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPAUSED": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndPaused": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndpaused"
 id.args = 1
@@ -1726,7 +1726,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPLAYFILE": id.Dependency = DEPENDENCY_AUDIO_DECODE
+id.n = qb64prefix$ + "SndPlayFile": id.Dependency = DEPENDENCY_AUDIO_DECODE
 id.subfunc = 2
 id.callname = "sub__sndplayfile"
 id.args = 3
@@ -1735,7 +1735,7 @@ id.specialformat = "?[,[?][,?]]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPLAYCOPY": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndPlayCopy": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndplaycopy"
 id.args = 2
@@ -1744,7 +1744,7 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDSTOP": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndStop": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndstop"
 id.args = 1
@@ -1752,7 +1752,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDLOOP": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndLoop": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndloop"
 id.args = 1
@@ -1760,7 +1760,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDLIMIT": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndLimit": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndlimit"
 id.args = 2
@@ -1768,7 +1768,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDOPEN": id.Dependency = DEPENDENCY_AUDIO_DECODE
+id.n = qb64prefix$ + "SndOpen": id.Dependency = DEPENDENCY_AUDIO_DECODE
 id.subfunc = 1
 id.callname = "func__sndopen"
 id.args = 2
@@ -1778,7 +1778,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDSETPOS": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndSetPos": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndsetpos"
 id.args = 2
@@ -1786,7 +1786,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDGETPOS": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndGetPos": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndgetpos"
 id.args = 1
@@ -1795,7 +1795,7 @@ id.ret = SINGLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPLAYING": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndPlaying": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndplaying"
 id.args = 1
@@ -1804,7 +1804,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPAUSE": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndPause": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndpause"
 id.args = 1
@@ -1812,7 +1812,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDBAL": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndBal": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndbal"
 id.args = 5
@@ -1822,7 +1822,7 @@ regid
 
 
 clearid
-id.n = qb64prefix$ + "SNDVOL": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndVol": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndvol"
 id.args = 2
@@ -1830,7 +1830,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDPLAY": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndPlay": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndplay"
 id.args = 1
@@ -1838,7 +1838,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDCOPY": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndCopy": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 1
 id.callname = "func__sndcopy"
 id.args = 1
@@ -1847,7 +1847,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SNDCLOSE": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = qb64prefix$ + "SndClose": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub__sndclose"
 id.args = 1
@@ -1855,7 +1855,7 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "INPUT"
+id.n = "Input"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_input"
@@ -1866,7 +1866,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "SEEK"
+id.n = "Seek"
 id.subfunc = 2
 id.callname = "sub_seek"
 id.args = 2
@@ -1875,7 +1875,7 @@ id.specialformat = "[#]?,?"
 regid
 
 clearid
-id.n = "SEEK"
+id.n = "Seek"
 id.subfunc = 1
 id.callname = "func_seek"
 id.args = 1
@@ -1884,7 +1884,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LOC"
+id.n = "Loc"
 id.subfunc = 1
 id.callname = "func_loc"
 id.args = 1
@@ -1912,7 +1912,7 @@ regid
 
 
 clearid
-id.n = "SCREEN"
+id.n = "Screen"
 id.subfunc = 1
 id.callname = "func_screen"
 id.args = 3
@@ -1922,7 +1922,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "PMAP"
+id.n = "PMap"
 id.subfunc = 1
 id.callname = "func_pmap"
 id.args = 2
@@ -1932,7 +1932,7 @@ regid
 
 
 clearid
-id.n = "POINT"
+id.n = "Point"
 id.subfunc = 1
 id.callname = "func_point"
 id.args = 2
@@ -1943,7 +1943,7 @@ regid
 
 
 clearid
-id.n = "TAB"
+id.n = "Tab"
 id.subfunc = 1
 id.callname = "func_tab"
 id.args = 1
@@ -1952,7 +1952,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "SPC"
+id.n = "Spc"
 id.subfunc = 1
 id.callname = "func_spc"
 id.args = 1
@@ -1962,7 +1962,7 @@ regid
 
 
 clearid
-id.n = "WAIT"
+id.n = "Wait"
 id.subfunc = 2
 id.callname = "sub_wait"
 id.args = 3
@@ -1971,7 +1971,7 @@ id.specialformat = "?,?[,?]"
 regid
 
 clearid
-id.n = "INP"
+id.n = "Inp"
 id.subfunc = 1
 id.callname = "func_inp"
 id.args = 1
@@ -1980,7 +1980,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "POS"
+id.n = "Pos"
 id.subfunc = 1
 id.callname = "func_pos"
 id.args = 1
@@ -1989,7 +1989,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "SGN"
+id.n = "Sgn"
 id.subfunc = 1
 id.callname = "func_sgn"
 id.args = 1
@@ -1998,7 +1998,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LBOUND"
+id.n = "LBound"
 id.subfunc = 1
 id.args = 2
 id.arg = MKL$(-1) + MKL$(LONGTYPE - ISPOINTER)
@@ -2007,7 +2007,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "UBOUND"
+id.n = "UBound"
 id.subfunc = 1
 id.args = 2
 id.arg = MKL$(-1) + MKL$(LONGTYPE - ISPOINTER)
@@ -2016,7 +2016,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "OCT"
+id.n = "Oct"
 id.musthave = "$"
 id.subfunc = 1
 id.args = 1
@@ -2025,7 +2025,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "HEX"
+id.n = "Hex"
 id.musthave = "$"
 id.subfunc = 1
 id.args = 1
@@ -2034,7 +2034,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "SLEEP"
+id.n = "Sleep"
 id.subfunc = 2
 id.callname = "sub_sleep"
 id.args = 1
@@ -2043,7 +2043,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = "EXP"
+id.n = "Exp"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2051,7 +2051,7 @@ id.ret = -1
 regid
 
 clearid
-id.n = "FIX"
+id.n = "Fix"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2059,7 +2059,7 @@ id.ret = -1
 regid
 
 clearid
-id.n = "INT"
+id.n = "Int"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2067,7 +2067,7 @@ id.ret = -1
 regid
 
 clearid
-id.n = "CDBL"
+id.n = "CDbl"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2075,7 +2075,7 @@ id.ret = DOUBLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = "CSNG"
+id.n = "CSng"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2083,7 +2083,7 @@ id.ret = SINGLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ROUND"
+id.n = qb64prefix$ + "Round"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2091,7 +2091,7 @@ id.ret = INTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = "CINT"
+id.n = "CInt"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2099,7 +2099,7 @@ id.ret = INTEGERTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "CLNG"
+id.n = "CLng"
 id.subfunc = 1
 id.args = 1
 id.arg = MKL$(-1)
@@ -2109,7 +2109,7 @@ regid
 
 
 clearid
-id.n = "TIME"
+id.n = "Time"
 id.musthave = "$"
 id.subfunc = 2
 id.callname = "sub_time"
@@ -2119,7 +2119,7 @@ id.specialformat = "=?"
 regid
 
 clearid
-id.n = "TIME"
+id.n = "Time"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_time"
@@ -2129,7 +2129,7 @@ regid
 
 
 clearid
-id.n = "DATE"
+id.n = "Date"
 id.musthave = "$"
 id.subfunc = 2
 id.callname = "sub_date"
@@ -2139,7 +2139,7 @@ id.specialformat = "=?"
 regid
 
 clearid
-id.n = "DATE"
+id.n = "Date"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_date"
@@ -2147,7 +2147,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "CSRLIN"
+id.n = "CsrLin"
 id.subfunc = 1
 id.callname = "func_csrlin"
 id.ret = LONGTYPE - ISPOINTER
@@ -2155,27 +2155,27 @@ regid
 
 
 clearid
-id.n = "PAINT"
+id.n = "Paint"
 id.subfunc = 2
 id.callname = "sub_paint"
 id.args = 5
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) + MKL$(STRINGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?)[,[?][,[?][,?]]]"
+id.specialformat = "[{Step}](?,?)[,[?][,[?][,?]]]"
 'PAINT [STEP] (x!,y!)[,[paint] [,[bordercolor&] [,background$]]]
 regid
 
 clearid
-id.n = "CIRCLE"
+id.n = "Circle"
 id.subfunc = 2
 id.callname = "sub_circle"
 id.args = 7
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?),?[,[?][,[?][,[?][,?]]]]"
+id.specialformat = "[{Step}](?,?),?[,[?][,[?][,[?][,?]]]]"
 'CIRCLE [STEP] (x!,y!),radius![,[color&] [,[start!] [,[end!] [,aspect!]]]]
 regid
 
 clearid
-id.n = "BLOAD"
+id.n = "BLoad"
 id.subfunc = 2
 id.callname = "sub_bload"
 id.args = 2
@@ -2184,7 +2184,7 @@ id.specialformat = "?[,?]"
 regid
 
 clearid
-id.n = "BSAVE"
+id.n = "BSave"
 id.subfunc = 2
 id.callname = "sub_bsave"
 id.args = 3
@@ -2192,7 +2192,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTY
 regid
 
 clearid
-id.n = "GET"
+id.n = "Get"
 id.subfunc = 2
 id.callname = "sub_get"
 id.args = 3
@@ -2202,7 +2202,7 @@ id.specialformat = "[#]?[,[?][,?]]" 'field complient definition
 regid
 
 clearid
-id.n = "PUT"
+id.n = "Put"
 id.subfunc = 2
 id.callname = "sub_put"
 id.args = 3
@@ -2213,51 +2213,51 @@ regid
 
 'double definition
 clearid
-id.n = "GET"
+id.n = "Get"
 id.subfunc = 2
 id.callname = "sub_graphics_get"
 id.args = 6
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(-3) + MKL$(ULONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?)-[{STEP}](?,?),?[,?]"
-id.secondargmustbe = "STEP"
+id.specialformat = "[{Step}](?,?)-[{Step}](?,?),?[,?]"
+id.secondargmustbe = "Step"
 regid
 
 clearid
-id.n = "GET"
+id.n = "Get"
 id.subfunc = 2
 id.callname = "sub_graphics_get"
 id.args = 6
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(-3) + MKL$(ULONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?)-[{STEP}](?,?),?[,?]"
+id.specialformat = "[{Step}](?,?)-[{Step}](?,?),?[,?]"
 id.secondargmustbe = "("
 regid
 
 'double definition
 clearid
-id.n = "PUT"
+id.n = "Put"
 id.subfunc = 2
 id.callname = "sub_graphics_put"
 id.args = 5
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(-3) + MKL$(LONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?),?[,[{_CLIP}][{PSET|PRESET|AND|OR|XOR}][,?]]"
+id.specialformat = "[{Step}](?,?),?[,[{_Clip}][{PSet|PReset|And|Or|Xor}][,?]]"
 'PUT [STEP] (x!,y!),arrayname# [(indexes%)] [,actionverb]
 'PUT (10, 10), myimage, _CLIP, 0
-id.secondargmustbe = "STEP"
+id.secondargmustbe = "Step"
 regid
 clearid
-id.n = "PUT"
+id.n = "Put"
 id.subfunc = 2
 id.callname = "sub_graphics_put"
 id.args = 5
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(-3) + MKL$(LONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?),?[,[{_CLIP}][{PSET|PRESET|AND|OR|XOR}][,?]]"
+id.specialformat = "[{Step}](?,?),?[,[{_Clip}][{PSet|PReset|And|Or|Xor}][,?]]"
 'PUT [STEP] (x!,y!),arrayname# [(indexes%)] [,actionverb]
 'PUT (10, 10), myimage, _CLIP, 0
 id.secondargmustbe = "("
 regid
 
 clearid
-id.n = "OPEN"
+id.n = "Open"
 id.subfunc = 2
 id.callname = "sub_open_gwbasic"
 id.args = 4
@@ -2265,16 +2265,16 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(STRING
 id.specialformat = "?,[#]?,?[,?]"
 regid
 clearid
-id.n = "OPEN"
+id.n = "Open"
 id.subfunc = 2
 id.callname = "sub_open"
 id.args = 6
 id.arg = MKL$(STRINGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "?[{FOR RANDOM|FOR BINARY|FOR INPUT|FOR OUTPUT|FOR APPEND}][{ACCESS READ WRITE|ACCESS READ|ACCESS WRITE}][{SHARED|LOCK READ WRITE|LOCK READ|LOCK WRITE}]{AS}[#]?[{LEN =}?]"
+id.specialformat = "?[{For Random|For Binary|For Input|For Output|For Append}][{Access Read Write|Access Read|Access Write}][{Shared|Lock Read Write|Lock Read|Lock Write}]{As}[#]?[{Len =}?]"
 regid
 
 clearid
-id.n = "VAL"
+id.n = "Val"
 id.subfunc = 1
 id.callname = "func_val"
 id.args = 1
@@ -2406,7 +2406,7 @@ id.ret = -1
 regid
 
 clearid
-id.n = "STRING"
+id.n = "String"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_string"
@@ -2416,7 +2416,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "SPACE"
+id.n = "Space"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_space"
@@ -2426,7 +2426,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "INSTR"
+id.n = "InStr"
 id.subfunc = 1
 id.callname = "func_instr"
 id.args = 3
@@ -2436,7 +2436,7 @@ id.specialformat = "[?],?,?" 'checked!
 regid
 
 clearid
-id.n = qb64prefix$ + "INSTRREV"
+id.n = qb64prefix$ + "InStrRev"
 id.subfunc = 1
 id.callname = "func__instrrev"
 id.args = 3
@@ -2446,7 +2446,7 @@ id.specialformat = "[?],?,?" 'checked!
 regid
 
 clearid
-id.n = "MID"
+id.n = "Mid"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_mid"
@@ -2457,7 +2457,7 @@ id.specialformat = "?,?,[?]" 'checked!
 regid
 
 clearid
-id.n = "SADD"
+id.n = "SAdd"
 id.subfunc = 1
 id.callname = ""
 id.args = 1
@@ -2475,7 +2475,7 @@ id.specialformat = "[?][,?]"
 regid
 
 clearid
-id.n = "SQR"
+id.n = "Sqr"
 id.subfunc = 1
 id.callname = "func_sqr"
 id.args = 1
@@ -2484,7 +2484,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "CHR"
+id.n = "Chr"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func_chr"
@@ -2494,7 +2494,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "VARPTR"
+id.n = "VarPtr"
 id.subfunc = 1
 id.callname = ""
 id.args = 1
@@ -2504,7 +2504,7 @@ id.musthave = "$"
 regid
 
 clearid
-id.n = "VARPTR"
+id.n = "VarPtr"
 id.subfunc = 1
 id.callname = ""
 id.args = 1
@@ -2513,7 +2513,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "OFFSET"
+id.n = qb64prefix$ + "Offset"
 id.subfunc = 1
 id.callname = ""
 id.args = 1
@@ -2522,7 +2522,7 @@ id.ret = UOFFSETTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "VARSEG"
+id.n = "VarSeg"
 id.subfunc = 1
 id.callname = ""
 id.args = 1
@@ -2531,7 +2531,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "POKE"
+id.n = "Poke"
 id.subfunc = 2
 id.callname = "sub_poke"
 id.args = 2
@@ -2539,7 +2539,7 @@ id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "PEEK"
+id.n = "Peek"
 id.subfunc = 1
 id.callname = "func_peek"
 id.args = 1
@@ -2548,17 +2548,17 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "DEF"
+id.n = "Def"
 id.subfunc = 2
 id.callname = "sub_defseg"
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{SEG}[=?]" 'checked!
-id.secondargmustbe = "SEG"
+id.specialformat = "{Seg}[=?]" 'checked!
+id.secondargmustbe = "Seg"
 regid
 
 clearid
-id.n = "SIN"
+id.n = "Sin"
 id.subfunc = 1
 id.callname = "sin"
 id.args = 1
@@ -2567,7 +2567,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "COS"
+id.n = "Cos"
 id.subfunc = 1
 id.callname = "cos"
 id.args = 1
@@ -2576,7 +2576,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "TAN"
+id.n = "Tan"
 id.subfunc = 1
 id.callname = "tan"
 id.args = 1
@@ -2585,7 +2585,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "ATN"
+id.n = "Atn"
 id.subfunc = 1
 id.callname = "atan"
 id.args = 1
@@ -2594,7 +2594,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LOG"
+id.n = "Log"
 id.subfunc = 1
 id.callname = "func_log"
 id.args = 1
@@ -2603,7 +2603,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "ABS"
+id.n = "Abs"
 id.subfunc = 1
 id.callname = "func_abs"
 id.args = 1
@@ -2612,7 +2612,7 @@ id.ret = FLOATTYPE - ISPOINTER '***overridden by function evaluatefunc***
 regid
 
 clearid
-id.n = "ERL"
+id.n = "Erl"
 id.subfunc = 1
 id.callname = "get_error_erl"
 id.args = 0
@@ -2620,7 +2620,7 @@ id.ret = DOUBLETYPE - ISPOINTER
 regid
 
 clearid
-id.n = "ERR"
+id.n = "Err"
 id.subfunc = 1
 id.callname = "get_error_err"
 id.args = 0
@@ -2628,7 +2628,7 @@ id.ret = ULONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "ERROR"
+id.n = "Error"
 id.subfunc = 2
 id.callname = "error"
 id.args = 1
@@ -2636,16 +2636,16 @@ id.arg = MKL$(ULONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "LINE"
+id.n = "Line"
 id.subfunc = 2
 id.callname = "sub_line"
 id.args = 7
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[[{STEP}](?,?)]-[{STEP}](?,?)[,[?][,[{B|BF}][,?]]]"
+id.specialformat = "[[{Step}](?,?)]-[{Step}](?,?)[,[?][,[{B|BF}][,?]]]"
 regid
 
 clearid
-id.n = "SOUND": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = "Sound": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub_sound"
 id.args = 2
@@ -2653,14 +2653,14 @@ id.arg = MKL$(DOUBLETYPE - ISPOINTER) + MKL$(DOUBLETYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "BEEP": id.Dependency = DEPENDENCY_AUDIO_OUT
+id.n = "Beep": id.Dependency = DEPENDENCY_AUDIO_OUT
 id.subfunc = 2
 id.callname = "sub_beep"
 id.args = 0
 regid
 
 clearid
-id.n = "TIMER"
+id.n = "Timer"
 id.subfunc = 1
 id.callname = "func_timer"
 id.args = 1
@@ -2670,7 +2670,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = "RND"
+id.n = "Rnd"
 id.subfunc = 1
 id.callname = "func_rnd"
 id.args = 1
@@ -2680,16 +2680,16 @@ id.specialformat = "[?]" 'checked!
 regid
 
 clearid
-id.n = "RANDOMIZE"
+id.n = "Randomize"
 id.subfunc = 2
 id.callname = "sub_randomize"
 id.args = 1
 id.arg = MKL$(DOUBLETYPE - ISPOINTER)
-id.specialformat = "[[{USING}]?]" 'checked!
+id.specialformat = "[[{Using}]?]" 'checked!
 regid
 
 clearid
-id.n = "OUT"
+id.n = "Out"
 id.subfunc = 2
 id.callname = "sub_out"
 id.args = 2
@@ -2697,7 +2697,7 @@ id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "PCOPY"
+id.n = "PCopy"
 id.subfunc = 2
 id.callname = "sub_pcopy"
 id.args = 2
@@ -2705,36 +2705,36 @@ id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "VIEW"
+id.n = "View"
 id.subfunc = 2
 id.callname = "qbg_sub_view"
 id.args = 6
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[[{SCREEN}](?,?)-(?,?)[,[?][,?]]]"
-id.secondargcantbe = "PRINT"
+id.specialformat = "[[{Screen}](?,?)-(?,?)[,[?][,?]]]"
+id.secondargcantbe = "Print"
 regid
 
 clearid
-id.n = "VIEW"
+id.n = "View"
 id.subfunc = 2
 id.callname = "qbg_sub_view_print"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "{PRINT}[?{TO}?]" 'new!
-id.secondargmustbe = "PRINT"
+id.specialformat = "{Print}[?{To}?]" 'new!
+id.secondargmustbe = "Print"
 regid
 
 clearid
-id.n = "WINDOW"
+id.n = "Window"
 id.subfunc = 2
 id.callname = "qbg_sub_window"
 id.args = 4
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER)
-id.specialformat = "[[{SCREEN}](?,?)-(?,?)]"
+id.specialformat = "[[{Screen}](?,?)-(?,?)]"
 regid
 
 clearid
-id.n = "LOCATE"
+id.n = "Locate"
 id.subfunc = 2
 id.callname = "qbg_sub_locate"
 id.args = 5
@@ -2743,7 +2743,7 @@ id.specialformat = "[?][,[?][,[?][,[?][,?]]]]"
 regid
 
 clearid
-id.n = "COLOR"
+id.n = "Color"
 id.subfunc = 2
 id.callname = "qbg_sub_color"
 id.args = 3
@@ -2752,7 +2752,7 @@ id.specialformat = "[?][,[?][,?]]"
 regid
 
 clearid
-id.n = "PALETTE"
+id.n = "Palette"
 id.subfunc = 2
 id.callname = "qbg_palette"
 id.args = 2
@@ -2761,18 +2761,18 @@ id.specialformat = "[?,?]"
 regid
 
 clearid
-id.n = "WIDTH"
+id.n = "Width"
 id.subfunc = 2
 id.callname = "qbsub_width"
 id.args = 5
 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{#|LPRINT}][?][,[?][,[?][,[?]]]]" 'new!
+id.specialformat = "[{#|LPrint}][?][,[?][,[?][,[?]]]]" 'new!
 'id.specialformat = "[{#|LPRINT}][?][,?]" 'new!
 regid
 
 
 clearid
-id.n = "SCREEN"
+id.n = "Screen"
 id.subfunc = 2
 id.callname = "qbg_screen"
 id.args = 5
@@ -2780,29 +2780,29 @@ id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE
 'id.specialformat = "[?][,[?][,[?][,?]]]" 'new!
 'id.specialformat = "[?][,[?][,[?][,[?][,{_MANUALDISPLAY}]]]]" 'breaks compilation!
 'id.specialformat = "[?][,[?][,[?][,[?][,[{_MANUALDISPLAY}]]]]]" <-pre-bulletproofing
-id.specialformat = "[?][,[?][,[?][,[?][,[{_MANUALDISPLAY}?]]]]]" 'a temp format for transition reasons"
+id.specialformat = "[?][,[?][,[?][,[?][,[{_ManualDisplay}?]]]]]" 'a temp format for transition reasons"
 regid
 
 clearid
-id.n = "PSET"
+id.n = "PSet"
 id.subfunc = 2
 id.callname = "sub_pset"
 id.args = 3
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?)[,?]"
+id.specialformat = "[{Step}](?,?)[,?]"
 regid
 
 clearid
-id.n = "PRESET"
+id.n = "PReset"
 id.subfunc = 2
 id.callname = "sub_preset"
 id.args = 3
 id.arg = MKL$(FLOATTYPE - ISPOINTER) + MKL$(FLOATTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{STEP}](?,?)[,?]"
+id.specialformat = "[{Step}](?,?)[,?]"
 regid
 
 clearid
-id.n = "ASC"
+id.n = "Asc"
 id.subfunc = 1
 id.callname = "qbs_asc"
 id.args = 1
@@ -2811,7 +2811,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LEN"
+id.n = "Len"
 id.subfunc = 1
 id.callname = "" 'callname is not used
 id.args = 1
@@ -2820,7 +2820,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "INKEY"
+id.n = "InKey"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_inkey"
@@ -2828,7 +2828,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "STR"
+id.n = "Str"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_str"
@@ -2838,7 +2838,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "UCASE"
+id.n = "UCase"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_ucase"
@@ -2848,7 +2848,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LCASE"
+id.n = "LCase"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_lcase"
@@ -2858,7 +2858,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LEFT"
+id.n = "Left"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_left"
@@ -2868,7 +2868,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "RIGHT"
+id.n = "Right"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_right"
@@ -2878,7 +2878,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "LTRIM"
+id.n = "LTrim"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_ltrim"
@@ -2888,7 +2888,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "RTRIM"
+id.n = "RTrim"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs_rtrim"
@@ -2898,7 +2898,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "TRIM"
+id.n = qb64prefix$ + "Trim"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "qbs__trim"
@@ -2908,7 +2908,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = "PRINT"
+id.n = "Print"
 id.subfunc = 2
 id.callname = "qbs_print" 'not called directly
 id.args = 1
@@ -2916,7 +2916,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "LPRINT": id.Dependency = DEPENDENCY_PRINTER
+id.n = "LPrint": id.Dependency = DEPENDENCY_PRINTER
 id.subfunc = 2
 id.callname = "qbs_lprint" 'not called directly
 id.args = 1
@@ -2924,7 +2924,7 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = "LPOS": id.Dependency = DEPENDENCY_PRINTER
+id.n = "LPos": id.Dependency = DEPENDENCY_PRINTER
 id.subfunc = 1
 id.callname = "func_lpos"
 id.args = 1
@@ -2943,7 +2943,7 @@ regid
 
 'Get the directory the program was started from (before the currenct directory is automatically changed to the executables directory)
 clearid
-id.n = qb64prefix$ + "STARTDIR"
+id.n = qb64prefix$ + "StartDir"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__startdir"
@@ -2952,7 +2952,7 @@ regid
 
 'Return a path that best represents the context provided e.g. _DIR$("DESKTOP")
 clearid
-id.n = qb64prefix$ + "DIR"
+id.n = qb64prefix$ + "Dir"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__dir"
@@ -2963,7 +2963,7 @@ regid
 
 'Return the name of the included file in which the last error occurred
 clearid
-id.n = qb64prefix$ + "INCLERRORFILE"
+id.n = qb64prefix$ + "InclErrorFile"
 id.musthave = "$"
 id.subfunc = 1
 id.callname = "func__inclerrorfile"
@@ -2971,7 +2971,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "KEYCLEAR"
+id.n = qb64prefix$ + "KeyClear"
 id.subfunc = 2
 id.args = 1
 id.arg = MKL$(LONGTYPE - ISPOINTER)
@@ -3034,7 +3034,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid   'Clear the old id info so we set the slate for a new one
-id.n = qb64prefix$ + "ATAN2" 'The name of our new one
+id.n = qb64prefix$ + "Atan2" 'The name of our new one
 id.subfunc = 1 'And this is a function
 id.callname = "atan2" 'The C name of the function
 id.args = 2 'It takes 2 parameters to work
@@ -3043,7 +3043,7 @@ id.ret = FLOATTYPE - ISPOINTER 'we want it to return to us a nice _FLOAT value
 regid 'and we're finished with ID registration
 
 clearid   'Clear the old id info so we set the slate for a new one
-id.n = qb64prefix$ + "HYPOT" 'The name of our new one
+id.n = qb64prefix$ + "Hypot" 'The name of our new one
 id.subfunc = 1 'And this is a function
 id.callname = "hypot" 'The C name of the function
 id.args = 2 'It takes 2 parameters to work
@@ -3052,7 +3052,7 @@ id.ret = FLOATTYPE - ISPOINTER 'we want it to return to us a nice _FLOAT value
 regid 'and we're finished with ID registration
 
 clearid
-id.n = qb64prefix$ + "ASIN"
+id.n = qb64prefix$ + "Asin"
 id.subfunc =  1
 id.callname = "asin"
 id.args = 1
@@ -3061,7 +3061,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ACOS"
+id.n = qb64prefix$ + "Acos"
 id.subfunc =  1
 id.callname = "acos"
 id.args = 1
@@ -3070,7 +3070,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SINH"
+id.n = qb64prefix$ + "Sinh"
 id.subfunc =  1
 id.callname = "sinh"
 id.args = 1
@@ -3079,7 +3079,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "COSH"
+id.n = qb64prefix$ + "Cosh"
 id.subfunc =  1
 id.callname = "cosh"
 id.args = 1
@@ -3088,7 +3088,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "TANH"
+id.n = qb64prefix$ + "Tanh"
 id.subfunc =  1
 id.callname = "tanh"
 id.args = 1
@@ -3097,7 +3097,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ASINH"
+id.n = qb64prefix$ + "Asinh"
 id.subfunc =  1
 id.callname = "asinh"
 id.args = 1
@@ -3106,7 +3106,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ACOSH"
+id.n = qb64prefix$ + "Acosh"
 id.subfunc =  1
 id.callname = "acosh"
 id.args = 1
@@ -3115,7 +3115,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ATANH"
+id.n = qb64prefix$ + "Atanh"
 id.subfunc =  1
 id.callname = "atanh"
 id.args = 1
@@ -3124,7 +3124,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CEIL"
+id.n = qb64prefix$ + "Ceil"
 id.subfunc =  1
 id.callname = "ceil"
 id.args = 1
@@ -3133,7 +3133,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "PI"
+id.n = qb64prefix$ + "Pi"
 id.subfunc = 1
 id.callname = "func_pi"
 id.args = 1
@@ -3143,7 +3143,7 @@ id.specialformat = "[?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "DESKTOPHEIGHT"
+id.n = qb64prefix$ + "DesktopHeight"
 id.subfunc = 1
 id.callname = "func_screenheight"
 id.args = 0
@@ -3151,7 +3151,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DESKTOPWIDTH"
+id.n = qb64prefix$ + "DesktopWidth"
 id.subfunc = 1
 id.callname = "func_screenwidth"
 id.args = 0
@@ -3159,19 +3159,19 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENICON"     'name change to from _ICONIFYWINDOW to _SCREENICON to match the screenshow and screenhide
+id.n = qb64prefix$ + "ScreenIcon"     'name change to from _ICONIFYWINDOW to _SCREENICON to match the screenshow and screenhide
 id.subfunc = 2
 id.callname = "sub_screenicon"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENEXISTS"
+id.n = qb64prefix$ + "ScreenExists"
 id.subfunc = 1
 id.callname = "func_windowexists"
 regid
 
 clearid
-id.n = qb64prefix$ + "CONTROLCHR"
+id.n = qb64prefix$ + "ControlChr"
 id.subfunc = 1
 id.callname = "func__controlchr"
 id.args = 0
@@ -3179,7 +3179,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "STRICMP"
+id.n = qb64prefix$ + "StriCmp"
 id.subfunc = 1
 id.callname = "func__str_nc_compare"
 id.args = 2
@@ -3188,7 +3188,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "STRCMP"
+id.n = qb64prefix$ + "StrCmp"
 id.subfunc = 1
 id.callname = "func__str_compare"
 id.args = 2
@@ -3197,7 +3197,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ARCSEC"
+id.n = qb64prefix$ + "Arcsec"
 id.subfunc =  1
 id.callname = "func_arcsec"
 id.args = 1
@@ -3206,7 +3206,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ARCCSC"
+id.n = qb64prefix$ + "Arccsc"
 id.subfunc =  1
 id.callname = "func_arccsc"
 id.args = 1
@@ -3215,7 +3215,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "ARCCOT"
+id.n = qb64prefix$ + "Arccot"
 id.subfunc =  1
 id.callname = "func_arccot"
 id.args = 1
@@ -3224,7 +3224,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SECH"
+id.n = qb64prefix$ + "Sech"
 id.subfunc =  1
 id.callname = "func_sech"
 id.args = 1
@@ -3233,7 +3233,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CSCH"
+id.n = qb64prefix$ + "Csch"
 id.subfunc =  1
 id.callname = "func_csch"
 id.args = 1
@@ -3242,7 +3242,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "COTH"
+id.n = qb64prefix$ + "Coth"
 id.subfunc =  1
 id.callname = "func_coth"
 id.args = 1
@@ -3251,7 +3251,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SEC"
+id.n = qb64prefix$ + "Sec"
 id.subfunc =  1
 id.callname = "func_sec"
 id.args = 1
@@ -3260,7 +3260,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CSC"
+id.n = qb64prefix$ + "Csc"
 id.subfunc =  1
 id.callname = "func_csc"
 id.args = 1
@@ -3269,7 +3269,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "COT"
+id.n = qb64prefix$ + "Cot"
 id.subfunc =  1
 id.callname = "func_cot"
 id.args = 1
@@ -3278,7 +3278,7 @@ id.ret = FLOATTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCREENICON"
+id.n = qb64prefix$ + "ScreenIcon"
 id.subfunc =  1
 id.callname = "func_screenicon"
 id.args = 0
@@ -3286,7 +3286,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "AUTODISPLAY"
+id.n = qb64prefix$ + "AutoDisplay"
 id.subfunc = 1
 id.callname = "func__autodisplay"
 id.args = 0
@@ -3312,7 +3312,7 @@ id.ret = UINTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "DEFLATE"
+id.n = qb64prefix$ + "Deflate"
 id.Dependency=DEPENDENCY_ZLIB
 id.musthave = "$"
 id.subfunc = 1
@@ -3323,7 +3323,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "INFLATE"
+id.n = qb64prefix$ + "Inflate"
 id.Dependency=DEPENDENCY_ZLIB
 id.musthave = "$"
 id.subfunc = 1
@@ -3335,7 +3335,7 @@ id.ret = STRINGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CINP"
+id.n = qb64prefix$ + "CInp"
 id.subfunc =  1
 id.callname = "func__cinp"
 id.args = 1
@@ -3345,7 +3345,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CAPSLOCK"
+id.n = qb64prefix$ + "CapsLock"
 id.subfunc =  1
 id.callname = "func__capslock"
 id.args = 0
@@ -3353,7 +3353,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SCROLLLOCK"
+id.n = qb64prefix$ + "ScrollLock"
 id.subfunc =  1
 id.callname = "func__scrolllock"
 id.args = 0
@@ -3361,7 +3361,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "NUMLOCK"
+id.n = qb64prefix$ + "NumLock"
 id.subfunc =  1
 id.callname = "func__numlock"
 id.args = 0
@@ -3369,34 +3369,34 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "CAPSLOCK"
+id.n = qb64prefix$ + "CapsLock"
 id.subfunc = 2
 id.callname = "sub__capslock"
 id.arg = MKL$(LONGTYPE - ISPOINTER)
 id.args = 1
-id.specialformat = "{ON|OFF|_TOGGLE}"
+id.specialformat = "{On|Off|_Toggle}"
 regid
 
 clearid
-id.n = qb64prefix$ + "SCROLLLOCK"
+id.n = qb64prefix$ + "Scrolllock"
 id.subfunc = 2
 id.callname = "sub__scrolllock"
 id.arg = MKL$(LONGTYPE - ISPOINTER)
 id.args = 1
-id.specialformat = "{ON|OFF|_TOGGLE}"
+id.specialformat = "{On|Off|_Toggle}"
 regid
 
 clearid
-id.n = qb64prefix$ + "NUMLOCK"
+id.n = qb64prefix$ + "Numlock"
 id.subfunc = 2
 id.callname = "sub__numlock"
 id.arg = MKL$(LONGTYPE - ISPOINTER)
 id.args = 1
-id.specialformat = "{ON|OFF|_TOGGLE}"
+id.specialformat = "{On|Off|_Toggle}"
 regid
 
 clearid
-id.n = qb64prefix$ + "CONSOLEFONT"
+id.n = qb64prefix$ + "ConsoleFont"
 id.subfunc = 2
 id.callname = "sub__consolefont"
 id.args = 2
@@ -3404,16 +3404,16 @@ id.arg = MKL$(STRINGTYPE - ISPOINTER) + MKL$(INTEGERTYPE - ISPOINTER)
 regid
 
 clearid
-id.n = qb64prefix$ + "CONSOLECURSOR"
+id.n = qb64prefix$ + "ConsoleCursor"
 id.subfunc = 2
 id.callname = "sub__console_cursor"
 id.args = 2
 id.arg = MKL$(LONGTYPE - ISPOINTER)  + MKL$(LONGTYPE - ISPOINTER)
-id.specialformat = "[{_SHOW|_HIDE}][,?]"
+id.specialformat = "[{_Show|_Hide}][,?]"
 regid
 
 clearid
-id.n = qb64prefix$ + "CONSOLEINPUT"
+id.n = qb64prefix$ + "ConsoleInput"
 id.subfunc =  1
 id.callname = "func__getconsoleinput"
 id.args = 0
@@ -3421,7 +3421,7 @@ id.ret = LONGTYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "READBIT"
+id.n = qb64prefix$ + "ReadBit"
 id.subfunc = 1
 id.callname = "func__readbit"
 id.args = 2
@@ -3430,7 +3430,7 @@ id.ret = INTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "SETBIT"
+id.n = qb64prefix$ + "SetBit"
 id.subfunc = 1
 id.callname = "func__setbit"
 id.args = 2
@@ -3439,7 +3439,7 @@ id.ret = UINTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "RESETBIT"
+id.n = qb64prefix$ + "ResetBit"
 id.subfunc = 1
 id.callname = "func__resetbit"
 id.args = 2
@@ -3448,7 +3448,7 @@ id.ret = UINTEGER64TYPE - ISPOINTER
 regid
 
 clearid
-id.n = qb64prefix$ + "TOGGLEBIT"
+id.n = qb64prefix$ + "ToggleBit"
 id.subfunc = 1
 id.callname = "func__togglebit"
 id.args = 2