diff --git a/ChangeLog b/ChangeLog
index e1404e196..c7e84fc4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 04 14:03:40 1997  Scott Christley  <scottc@net-community.com>
+
+	* Source/NSSlider.m (MB_NSSLIDER_CLASS): Rename to follow GNU
+	coding standards.
+	* Source/NSTextField.m (MB_NSTEXTFIELDCELL_CLASS): Likewise.
+
 Sat Mar 29 11:58:31 1997  GNUstep Development  <gnustep@net-community.com>
 
 	* Source/NSApplication.m (NullEvent): Rename global variable to
diff --git a/Source/NSSlider.m b/Source/NSSlider.m
index 7e7e56182..49b243531 100644
--- a/Source/NSSlider.m
+++ b/Source/NSSlider.m
@@ -32,7 +32,7 @@
 //
 // class variables
 //
-static id MB_NSSLIDER_CLASS = nil;
+id gnustep_gui_nsslider_cell_class = nil;
 
 //
 // NSSlider implementation
@@ -59,12 +59,12 @@ static id MB_NSSLIDER_CLASS = nil;
 //
 + (Class)cellClass
 {
-  return MB_NSSLIDER_CLASS;
+  return gnustep_gui_nsslider_cell_class;
 }
 
 + (void)setCellClass:(Class)classId
 {
-  MB_NSSLIDER_CLASS = classId;
+  gnustep_gui_nsslider_cell_class = classId;
 }
 
 //
@@ -79,7 +79,7 @@ static id MB_NSSLIDER_CLASS = nil;
   [super initWithFrame:frameRect];
 
   // set our cell
-  [self setCell:[[MB_NSSLIDER_CLASS new] autorelease]];
+  [self setCell:[[gnustep_gui_nsslider_cell_class new] autorelease]];
   if (frame.size.width > frame.size.height)
     [cell setVertical:NO];
   else
diff --git a/Source/NSTextField.m b/Source/NSTextField.m
index e896db700..2cb5743d7 100644
--- a/Source/NSTextField.m
+++ b/Source/NSTextField.m
@@ -35,7 +35,7 @@
 //
 // class variables
 //
-static id MB_NSTEXTFIELDCELL_CLASS = nil;
+id gnustep_gui_nstextfield_cell_class = nil;
 
 @implementation NSTextField
 
@@ -59,12 +59,12 @@ static id MB_NSTEXTFIELDCELL_CLASS = nil;
 //
 + (Class)cellClass
 {
-  return MB_NSTEXTFIELDCELL_CLASS;
+  return gnustep_gui_nstextfield_cell_class;
 }
 
 + (void)setCellClass:(Class)classId
 {
-  MB_NSTEXTFIELDCELL_CLASS = classId;
+  gnustep_gui_nstextfield_cell_class = classId;
 }
 
 //
@@ -80,7 +80,7 @@ static id MB_NSTEXTFIELDCELL_CLASS = nil;
   [super initWithFrame:frameRect];
 
   // set our cell
-  [self setCell:[[MB_NSTEXTFIELDCELL_CLASS new] autorelease]];
+  [self setCell:[[gnustep_gui_nstextfield_cell_class new] autorelease]];
   [cell setState:1];
   text_cursor = [NSCursor IBeamCursor];