diff --git a/ChangeLog b/ChangeLog
index 95934f3..728e44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-23  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/xlib/GSXftFontInfo.h: Renamed from XftFontInfo
+	* Source/xlib/GSXftFontInfo.m: Idem.
+	* Source/xlib/GNUmakefile: Update for change.
+	* Source/xlib/XGContext.m: Idem.
+	
 2003-01-23  Adam Fedor  <fedor@gnu.org>
 
 	* Documentation/Back: Some documentation.
diff --git a/Headers/xlib/XftFontInfo.h b/Headers/xlib/GSXftFontInfo.h
similarity index 96%
rename from Headers/xlib/XftFontInfo.h
rename to Headers/xlib/GSXftFontInfo.h
index 4f93364..da6f00b 100644
--- a/Headers/xlib/XftFontInfo.h
+++ b/Headers/xlib/GSXftFontInfo.h
@@ -1,5 +1,5 @@
 /*
-   XftFontInfo
+   GSXftFontInfo
 
    NSFont helper for GNUstep GUI X/GPS Backend
 
@@ -34,7 +34,7 @@
 
 #include <AppKit/GSFontInfo.h>
 
-@interface XftFontInfo : GSFontInfo
+@interface GSXftFontInfo : GSFontInfo
 {
   XftFont *font_info;
 }
diff --git a/Source/xlib/GNUmakefile b/Source/xlib/GNUmakefile
index 5088dfc..913dbf8 100644
--- a/Source/xlib/GNUmakefile
+++ b/Source/xlib/GNUmakefile
@@ -48,7 +48,7 @@ XGGeometry.m \
 linking.m
 
 ifeq ($(WITH_XFT),yes)
-xlib_OBJC_FILES += XftFontInfo.m
+xlib_OBJC_FILES += GSXftFontInfo.m
 endif
 
 xlib_HEADER_FILES_DIR = ../../Headers/xlib
diff --git a/Source/xlib/XftFontInfo.m b/Source/xlib/GSXftFontInfo.m
similarity index 98%
rename from Source/xlib/XftFontInfo.m
rename to Source/xlib/GSXftFontInfo.m
index 41d7dcc..4e9dfa5 100644
--- a/Source/xlib/XftFontInfo.m
+++ b/Source/xlib/GSXftFontInfo.m
@@ -1,5 +1,5 @@
 /*
-   XftFontInfo
+   GSXftFontInfo
 
    NSFont helper for GNUstep GUI X/GPS Backend
 
@@ -37,21 +37,21 @@
 // For the encoding functions
 #include <base/Unicode.h>
 
-#include "xlib/XftFontInfo.h"
+#include "xlib/GSXftFontInfo.h"
 
 /*
  * class global dictionary of existing fonts
  */
 static NSMutableDictionary	*_globalFontDictionary = nil;
 
-@interface XftFontInfo (Private)
+@interface GSXftFontInfo (Private)
 
 - (BOOL) setupAttributes;
 - (XGlyphInfo *)xGlyphInfo: (NSGlyph) glyph;
 
 @end
 
-@implementation XftFontInfo
+@implementation GSXftFontInfo
 
 - initWithFontName: (NSString*)name matrix: (const float *)fmatrix
 {
@@ -305,7 +305,7 @@ static NSMutableDictionary	*_globalFontDictionary = nil;
 
 @end
 
-@implementation XftFontInfo (Private)
+@implementation GSXftFontInfo (Private)
 
 - (BOOL) setupAttributes
 {
diff --git a/Source/xlib/XGContext.m b/Source/xlib/XGContext.m
index 14aea25..b957318 100644
--- a/Source/xlib/XGContext.m
+++ b/Source/xlib/XGContext.m
@@ -44,7 +44,7 @@
 #include "xlib/XGGState.h"
 
 #ifdef HAVE_XFT
-#include "xlib/XftFontInfo.h"
+#include "xlib/GSXftFontInfo.h"
 #endif
 
 #include <X11/Xlib.h>
@@ -78,7 +78,7 @@
 #ifdef HAVE_XFT
   if ([[NSUserDefaults standardUserDefaults] boolForKey: @"GSFontAntiAlias"])
     {
-      fontClass = [XftFontInfo class];
+      fontClass = [GSXftFontInfo class];
     }
 #endif
   if (fontClass == Nil)