diff --git a/Headers/gnustep/base/NSGArray.h b/Headers/gnustep/base/NSGArray.h
index 56c3526e1..a720754fa 100644
--- a/Headers/gnustep/base/NSGArray.h
+++ b/Headers/gnustep/base/NSGArray.h
@@ -1,4 +1,4 @@
-/* Interface to concrete implementation of NSArray.
+/* Interface to concrete implementation of NSArray based on GNU Array
    Copyright (C) 1995 Free Software Foundation, Inc.
    
    Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
@@ -21,14 +21,14 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    */
 
-#ifndef __NSConcreteArray_h_OBJECTS_INCLUDE
-#define __NSConcreteArray_h_OBJECTS_INCLUDE
+#ifndef __NSGArray_h_OBJECTS_INCLUDE
+#define __NSGArray_h_OBJECTS_INCLUDE
 
 #include <objects/stdobjects.h>
 #include <foundation/NSArray.h>
 #include <objects/elt.h>
 
-@interface NSConcreteArray : NSArray
+@interface NSGArray : NSArray
 {
   /* For now, these must match the instance variables in objects/Array.h.
      This will change. */
@@ -41,7 +41,7 @@
 
 @end
 
-@interface NSConcreteMutableArray : NSArray
+@interface NSGMutableArray : NSMutableArray
 {
   /* For now, these must match the instance variables in objects/Array.h.
      This will change. */
@@ -54,4 +54,4 @@
 
 @end
 
-#endif /* __NSConcreteArray_h_OBJECTS_INCLUDE */
+#endif /* __NSGArray_h_OBJECTS_INCLUDE */
diff --git a/Source/NSArray.m b/Source/NSArray.m
index 75b7adae6..841789cd6 100644
--- a/Source/NSArray.m
+++ b/Source/NSArray.m
@@ -24,7 +24,7 @@
 
 #include <foundation/NSArray.h>
 #include <foundation/NSString.h>
-#include <foundation/NSConcreteArray.h>
+#include <foundation/NSGArray.h>
 #include <foundation/NSArrayEnumerator.h>
 #include <limits.h>
 
@@ -32,12 +32,12 @@
 
 + array
 {
-  return [[[NSConcreteArray alloc] init] autorelease];
+  return [[[NSGArray alloc] init] autorelease];
 }
 
 + arrayWithObject: anObject
 {
-  id a = [[[NSConcreteArray class] alloc] init];
+  id a = [[[NSGArray class] alloc] init];
   [a addObject: anObject];
   return [a autorelease];
 }
@@ -88,7 +88,7 @@
 {
   va_list ap;
   va_start(ap, firstObject);
-  self = [[NSConcreteArray alloc] initWithObjects:firstObject rest:ap];
+  self = [[NSGArray alloc] initWithObjects:firstObject rest:ap];
   va_end(ap);
   return [self autorelease];
 }
@@ -263,7 +263,7 @@
 
 - mutableCopyWithZone: (NSZone*)zone
 {
-  return [[NSConcreteMutableArray allocWithZone:zone] initWithArray:self];
+  return [[NSGMutableArray allocWithZone:zone] initWithArray:self];
 }
 
 @end
@@ -272,7 +272,7 @@
 
 + arrayWithCapacity: (unsigned)numItems
 {
-  return [[[[NSConcreteMutableArray class] alloc] initWithCapacity:numItems] 
+  return [[[[NSGMutableArray class] alloc] initWithCapacity:numItems] 
 	  autorelease];
 }
 
diff --git a/Source/NSCoder.m b/Source/NSCoder.m
index 2693a0a5c..116f9a82d 100644
--- a/Source/NSCoder.m
+++ b/Source/NSCoder.m
@@ -24,7 +24,7 @@
 
 #include <objects/stdobjects.h>
 #include <foundation/NSCoder.h>
-#include <foundation/NSConcreteCoder.h>
+#include <foundation/NSGCoder.h>
 #include <objects/NSCoder.h>
 
 @implementation NSCoder
diff --git a/Source/NSGArray.m b/Source/NSGArray.m
index acfe4974a..059d0dc65 100644
--- a/Source/NSGArray.m
+++ b/Source/NSGArray.m
@@ -1,4 +1,4 @@
-/* NSArray - Array object to hold other objects.
+/* Concrete implementation of NSArray based on GNU Array class
    Copyright (C) 1995 Free Software Foundation, Inc.
    
    Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
@@ -21,13 +21,13 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    */
 
-#include <foundation/NSConcreteArray.h>
+#include <foundation/NSGArray.h>
 #include <objects/NSArray.h>
 #include <objects/behavior.h>
 #include <objects/Array.h>
 #include <objects/ArrayPrivate.h>
 
-@implementation NSConcreteArray
+@implementation NSGArray
 
 + (void) initialize
 {
@@ -36,7 +36,7 @@
   if (!done)
     {
       done = 1;
-      class_add_behavior([NSConcreteArray class], [Array class]);
+      class_add_behavior([NSGArray class], [Array class]);
     }
 }
 
@@ -74,7 +74,7 @@
 
 @end
 
-@implementation NSConcreteMutableArray
+@implementation NSGMutableArray
 
 + (void) initialize
 {
@@ -82,9 +82,8 @@
   if (!done)
     {
       done = 1;
-      class_add_behavior([NSConcreteMutableArray class], 
-			 [NSConcreteArray class]);
-      class_add_behavior([NSConcreteMutableArray class], [Array class]);
+      class_add_behavior([NSGMutableArray class], [NSGArray class]);
+      class_add_behavior([NSGMutableArray class], [Array class]);
     }
 }
 
diff --git a/Source/NSGCoder.m b/Source/NSGCoder.m
index d90fa54e9..9985a8c5d 100644
--- a/Source/NSGCoder.m
+++ b/Source/NSGCoder.m
@@ -34,7 +34,7 @@
   if (!done)
     {
       done = 1;
-      class_add_behavior([NSConcreteCoder class], [Coder class]);
+      class_add_behavior([NSGCoder class], [Coder class]);
     }
 }