diff --git a/Appl/Breadbox/SBarP/Art/nd-ico.goh b/Appl/Breadbox/SBarP/Art/ndico.goh
similarity index 100%
rename from Appl/Breadbox/SBarP/Art/nd-ico.goh
rename to Appl/Breadbox/SBarP/Art/ndico.goh
diff --git a/Appl/Breadbox/SBarP/SBarApp.goh b/Appl/Breadbox/SBarP/SBarApp.goh
index d1813ab96..d6926efaa 100644
--- a/Appl/Breadbox/SBarP/SBarApp.goh
+++ b/Appl/Breadbox/SBarP/SBarApp.goh
@@ -4,12 +4,12 @@
 **      Copyright 1991-94 Geoworks -- All Rights Reserved
 **      Project:        QBar
 **      Module:         QBARAPP.GOH
-**      Filename:       
+**      Filename:
 **      Author:         Clemens Kochinke
  *************************************/
 @include <stdapp.goh>   /* Standard application headers. */
-@include <ansi/string.h>   /* Ansi C string function header */
-@include <gstring.h>    
+@include <Ansi/string.h>   /* Ansi C string function header */
+@include <gstring.h>
 @include <iacp.goh>
 @include <Objects/eMenuC.goh>
 
@@ -34,8 +34,8 @@ typedef ByteEnum DBOpenState;
 #define STARTBAR_OPEN_PREF_NEWDESK      7
 
 /***************************************
- *      Class 
- ***************************************/                               
+ *      Class
+ ***************************************/
 @class StartBarProcessClass, GenProcessClass;
     @message void MSG_STARTBAR_OPEN_PREF(byte whichApp);
     @message void MSG_STARTBAR_EMENU();
diff --git a/Appl/Breadbox/SBarP/SBarMsg.goc b/Appl/Breadbox/SBarP/SBarMsg.goc
index ebc1faad0..6bf094de5 100644
--- a/Appl/Breadbox/SBarP/SBarMsg.goc
+++ b/Appl/Breadbox/SBarP/SBarMsg.goc
@@ -7,8 +7,8 @@ File:             sbarmsg.goc
 Date:             12/31/1997
 Author:           Clemens Kochinke
 ****************************************************************/
-@include <sbarapp.goh>
-@include <Objects/sbarutil.goh>
+@include <SBarApp.goh>
+@include <Objects/SBarUtil.goh>
 
 extern Boolean G_autohideOn;
 extern Boolean G_barIsShowing ;
@@ -89,13 +89,13 @@ void StopAutoHideTimer(void)
     }
 }
 
-@start TextRes, data;
+@start TEXTRES, data;
     /*---------------------------------------------------------------------*/
     @chunk char LaunchErr[] =
                     "The program is not in World or System\\Sysappl "
                     "and cannot be started.";
     /*---------------------------------------------------------------------*/
-@end TextRes;
+@end TEXTRES;
 
 @if 1
 @extern method StartBarProcessClass, MSG_STARTBAR_OPEN_PREF
diff --git a/Appl/Breadbox/SBarP/SBarUI.goc b/Appl/Breadbox/SBarP/SBarUI.goc
index 0d92256fa..2e267219c 100644
--- a/Appl/Breadbox/SBarP/SBarUI.goc
+++ b/Appl/Breadbox/SBarP/SBarUI.goc
@@ -22,18 +22,18 @@
  *******************************************************************/
 
 @include <stdapp.goh>
-@include <system.h>  
+@include <system.h>
 @include <initfile.h>
-@include "Sbarapp.goh"  
-@include "Art/ndstart.goh"
-@include "Art/nd-ico.goh"
-@include <objects/text/tcommon.h>
+@include "SBarApp.goh"
+@include "Art/NDStart.goh"
+@include "Art/ndico.goh"
+@include <Objects/Text/tCommon.h>
 @include <timedate.h>
 @include <Ansi/stdio.h>
 @include <launchp.h>
 @include <resource.h>
 @include <library.h>
-@include <Objects/sbarutil.goh>
+@include <Objects/SBarUtil.goh>
 
 /* @define ALLOW_PROPERTY_STARTBAR_AUTO_LOAD */
 @define COMPILE_OPTION_START_BUTTON_OPENS_EXPRESS_MENU
@@ -275,7 +275,7 @@ optr G_moduleParents[MAX_STARTBAR_MODULES] ;
 /* The following objects are the pop up menus that appear usually from */
 /* right clicking on an item */
 
-@start StartBarMenuRes;
+@start STARTBARMENURES;
     /*---------------------------------------------------------------------*/
     @object GenInteractionClass EMenu = {
         GI_comp = @EM1;
@@ -724,7 +724,7 @@ optr G_moduleParents[MAX_STARTBAR_MODULES] ;
         ATTR_GEN_TRIGGER_INTERACTION_COMMAND = { IC_DISMISS };
     }
     /*---------------------------------------------------------------------*/
-@end StartBarMenuRes;
+@end STARTBARMENURES;
 
 
 /*=========================================================================*/
diff --git a/Appl/Breadbox/SBarP/SBarP.gp b/Appl/Breadbox/SBarP/sbarp.gp
similarity index 100%
rename from Appl/Breadbox/SBarP/SBarP.gp
rename to Appl/Breadbox/SBarP/sbarp.gp
diff --git a/Library/Breadbox/SBarUtil/SBarUtil.goc b/Library/Breadbox/SBarUtil/SBarUtil.goc
index ef30a319b..587f3189a 100644
--- a/Library/Breadbox/SBarUtil/SBarUtil.goc
+++ b/Library/Breadbox/SBarUtil/SBarUtil.goc
@@ -12,7 +12,7 @@
  **************************************************************************/
 
 @include <stdapp.goh>
-@include <Objects/sbarutil.goh>
+@include <Objects/SBarUtil.goh>
 @include <Ansi/string.h>
 @include <initfile.h>
 
diff --git a/Library/Breadbox/SBarUtil/local.mk b/Library/Breadbox/SBarUtil/local.mk
index 767b16024..23d7232db 100644
--- a/Library/Breadbox/SBarUtil/local.mk
+++ b/Library/Breadbox/SBarUtil/local.mk
@@ -3,5 +3,5 @@
 XGOCFLAGS = -L sbarutil
 
 # Force Borland C to create code that loads DS in function entry
-XCCOMFLAGS = -WDE
+# XCCOMFLAGS = -WDE
 
diff --git a/Library/Breadbox/SBarUtil/SBarUtil.gp b/Library/Breadbox/SBarUtil/sbarutil.gp
similarity index 82%
rename from Library/Breadbox/SBarUtil/SBarUtil.gp
rename to Library/Breadbox/SBarUtil/sbarutil.gp
index a4549c00f..7f3071a15 100644
--- a/Library/Breadbox/SBarUtil/SBarUtil.gp
+++ b/Library/Breadbox/SBarUtil/sbarutil.gp
@@ -7,7 +7,7 @@
 #
 ##############################################################################
 
-name            sbarutil.lib
+name            SBarUtil.lib
 longname        "Startbar Utilities Module"
 tokenchars      "SBrU"
 tokenid         16431
@@ -26,4 +26,4 @@ export          StartbarHighlightBoxClass
 export          StartbarUtilLoadApplication
 
 
-usernotes "Copyright 1994-2002  Breadbox Computer Company LLC  All Rights Reserved"
\ No newline at end of file
+# usernotes "Copyright 1994-2002  Breadbox Computer Company LLC  All Rights Reserved"
\ No newline at end of file