diff --git a/twander.py b/twander.py
index 9d30da0..01d433a 100755
--- a/twander.py
+++ b/twander.py
@@ -4,7 +4,7 @@
 # For Updates See:  http://www.tundraware.com/Software/twander
 
 PROGNAME = "twander"
-RCSID = "$Id: twander.py,v 2.33 2002/12/23 21:41:37 tundra Exp $"
+RCSID = "$Id: twander.py,v 2.34 2002/12/23 22:34:54 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 
@@ -219,11 +219,11 @@
 COMMENT    = r"#"              # Comment introducer string
 ENVVBL     = r'$'              # Symbol denoting an environment variable
 MAXNESTING = 32                # Maximum depth of nested variable definitions
-QUOTECHAR  = '\"'              # Character to use when quoting builtin substitutions
+QUOTECHAR  = '\"'              # Character to use when quoting Built-In Variables
 reVAR      = r"\[.+?\]"        # Regex describing variable notation
 
 
-# Builtins
+# Built-In Variables
 
 DIR         = r'[DIR]'
 DSELECTION  = r'[DSELECTION]'
@@ -305,7 +305,7 @@
           "          -q        quiet mode - no warnings (default: warnings on)",
           "          -r        turn off automatic content refreshing (default: refresh on)",
           "          -s size   size of font to use (default: 12)",
-          "          -t        no quoting when substituting builtin variables (default: quoting on)",
+          "          -t        no quoting when substituting Built-In Variables (default: quoting on)",
           "          -v        print detailed version information",
           "          -w wght   weight/style of font to use (default: bold)",
           "          -x width  window width (default: 60)",
@@ -543,12 +543,12 @@
     # to be a key rebinding, not a user variable definition.
     #
     # Finally, the LHS cannot be one of the program
-    # builtin variables - it is an error, for example,
+    # Built-In Variables - it is an error, for example,
     # to have something like:
     #
     #        DIR = string
     #
-    # because "DIR" is a builtin variable name.
+    # because "DIR" is a Built-In Variable name.
     #
 
     elif ((dummy[0].count(ASSIGN) + dummy[1].count(ASSIGN)) > 0) and (fields[0][0] != ASSIGN):
@@ -600,7 +600,7 @@
                 # Get a list of variable references
                 vbls = revar.findall(cmd)
 
-                # Throw away references to builtins - these are
+                # Throw away references to Built-In Variables - these are
                 # processed at runtime and should be left alone here.
 
                 # Note that we iterate over a *copy* of the variables
@@ -610,7 +610,7 @@
 
                 for x in vbls[:]:
 
-                    # Ignore references to builtins here - They are
+                    # Ignore references to Built-In Variables here - They are
                     # processed at runtime.
                     
                     if UI.BuiltIns.has_key(x):
@@ -1874,7 +1874,7 @@
 # Get starting directory into canonical form
 STARTDIR = os.path.abspath(STARTDIR)
 
-# Setup builtin variables
+# Setup Built-In Variables
 UI.BuiltIns = {DIR:"", DSELECTION:"", DSELECTIONS:"", HASH:"",
                PROMPT:"", SELECTION:"", SELECTIONS:""}