diff --git a/Source/NSDate.m b/Source/NSDate.m
index 7ff40a237..963f2d68c 100644
--- a/Source/NSDate.m
+++ b/Source/NSDate.m
@@ -226,7 +226,7 @@ @interface	GSDateFuture : GSDateSingle
 
 #endif
 
-@implementation CONCRETE_CLASS_NAME
+@implementation DATE_CONCRETE_CLASS_NAME
 
 #if USE_SMALL_DATE
 
@@ -679,7 +679,7 @@ + (void) initialize
     {
       [self setVersion: 1];
       abstractClass = self;
-      concreteClass = [CONCRETE_CLASS_NAME class];
+      concreteClass = [DATE_CONCRETE_CLASS_NAME class];
       calendarClass = [NSCalendarDate class];
     }
 }
@@ -689,7 +689,7 @@ + (id) alloc
   if (self == abstractClass)
     {
       #if USE_SMALL_DATE
-      return [CONCRETE_CLASS_NAME alloc]; // alloc is overridden to return a small object
+      return [DATE_CONCRETE_CLASS_NAME alloc]; // alloc is overridden to return a small object
       #else
       return NSAllocateObject(concreteClass, 0, NSDefaultMallocZone());
       #endif
@@ -702,7 +702,7 @@ + (id) allocWithZone: (NSZone*)z
   if (self == abstractClass)
     {
       #if USE_SMALL_DATE
-      return [CONCRETE_CLASS_NAME alloc]; // alloc is overridden to return a small object
+      return [DATE_CONCRETE_CLASS_NAME alloc]; // alloc is overridden to return a small object
       #else
       return NSAllocateObject(concreteClass, 0, z);
       #endif
diff --git a/Source/NSDatePrivate.h b/Source/NSDatePrivate.h
index fea051410..07075d748 100644
--- a/Source/NSDatePrivate.h
+++ b/Source/NSDatePrivate.h
@@ -25,14 +25,13 @@
 
 #if defined(OBJC_SMALL_OBJECT_SHIFT) && (OBJC_SMALL_OBJECT_SHIFT == 3)
 #define USE_SMALL_DATE 1
-// FIXME: Change to DATE_CONCRETE_CLASS_NAME
-#define CONCRETE_CLASS_NAME GSSmallDate
+#define DATE_CONCRETE_CLASS_NAME GSSmallDate
 #else
 #define USE_SMALL_DATE 0
-#define CONCRETE_CLASS_NAME = NSGDate
+#define DATE_CONCRETE_CLASS_NAME NSGDate
 #endif
 
-@interface CONCRETE_CLASS_NAME : NSDate
+@interface DATE_CONCRETE_CLASS_NAME : NSDate
 #if USE_SMALL_DATE == 0
 {
 @public
diff --git a/Source/NSTimer.m b/Source/NSTimer.m
index 52f6b2408..1646c124c 100644
--- a/Source/NSTimer.m
+++ b/Source/NSTimer.m
@@ -57,7 +57,7 @@ + (void) initialize
 {
   if (self == [NSTimer class])
     {
-      NSDate_class = [CONCRETE_CLASS_NAME class];
+      NSDate_class = [DATE_CONCRETE_CLASS_NAME class];
     }
 }