Xutf8->XFree86utf8

41 files changed, 180 insertions, 178 deletions

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index f3aae5a7..9f86f9fb 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -3649,7 +3649,7 @@ extern int XwcTextEscapement(
     int			/* num_wchars */
 );
 
-extern int Xutf8TextEscapement(
+extern int XFree86utf8TextEscapement(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */
@@ -3671,7 +3671,7 @@ extern int XwcTextExtents(
     XRectangle*		/* overall_logical_return */
 );
 
-extern int Xutf8TextExtents(
+extern int XFree86utf8TextExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
@@ -3703,7 +3703,7 @@ extern Status XwcTextPerCharExtents(
     XRectangle*		/* overall_logical_return */
 );
 
-extern Status Xutf8TextPerCharExtents(
+extern Status XFree86utf8TextPerCharExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
@@ -3735,7 +3735,7 @@ extern void XwcDrawText(
     int			/* nitems */
 );
 
-extern void Xutf8DrawText(
+extern void XFree86utf8DrawText(
     Display*		/* display */,
     Drawable		/* d */,
     GC			/* gc */,
@@ -3767,7 +3767,7 @@ extern void XwcDrawString(
     int			/* num_wchars */
 );
 
-extern void Xutf8DrawString(
+extern void XFree86utf8DrawString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3800,7 +3800,7 @@ extern void XwcDrawImageString(
     int			/* num_wchars */
 );
 
-extern void Xutf8DrawImageString(
+extern void XFree86utf8DrawImageString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3862,7 +3862,7 @@ extern char *XmbResetIC(
     XIC /* ic */
 );
 
-extern char *Xutf8ResetIC(
+extern char *XFree86utf8ResetIC(
     XIC /* ic */
 );
 
@@ -3901,7 +3901,7 @@ extern int XwcLookupString(
     Status*		/* status_return */
 );
 
-extern int Xutf8LookupString(
+extern int XFree86utf8LookupString(
     XIC			/* ic */,
     XKeyPressedEvent*	/* event */,
     char*		/* buffer_return */,
diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h
index 85b299d3..2bcd2b0a 100644
--- a/include/X11/Xutil.h
+++ b/include/X11/Xutil.h
@@ -170,7 +170,7 @@ typedef enum {
     XTextStyle,			/* text in owner's encoding (current locale)*/
     XStdICCTextStyle,		/* STRING, else COMPOUND_TEXT */
     /* The following is an XFree86 extension, introduced in November 2000 */
-    XUTF8StringStyle		/* UTF8_STRING */
+    XFree86Utf8StringStyle	/* UTF8_STRING */
 } XICCEncodingStyle;
 
 typedef struct {
@@ -672,7 +672,7 @@ extern void XmbSetWMProperties(
     XClassHint*		/* class_hints */
 );
 
-extern void Xutf8SetWMProperties(
+extern void XFree86utf8SetWMProperties(
     Display*		/* display */,
     Window		/* w */,
     _Xconst char*	/* window_name */,
@@ -744,7 +744,7 @@ extern int XwcTextListToTextProperty(
     XTextProperty*	text_prop_return
 );
 
-extern int Xutf8TextListToTextProperty(
+extern int XFree86utf8TextListToTextProperty(
     Display*		display,
     char**		list,
     int			count,
@@ -776,7 +776,7 @@ extern int XwcTextPropertyToTextList(
     int*		count_return
 );
 
-extern int Xutf8TextPropertyToTextList(
+extern int XFree86utf8TextPropertyToTextList(
     Display*		display,
     const XTextProperty* text_prop,
     char***		list_return,
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index 7d3a5cc4..98cd66dc 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -1212,7 +1212,7 @@ _XimProtoWcReset(
 }
 
 Private char *
-_XimCommitedUtf8String(
+_XFree86imCommitedUtf8String(
     Xim			 im,
     Xic			 ic,
     XPointer		 buf)
@@ -1262,10 +1262,10 @@ Error_On_Reset:
 }
 
 Private char *
-_XimProtoUtf8Reset(
+_XFree86imProtoUtf8Reset(
     XIC		 xic)
 {
-    return _XimProtoReset(xic, _XimCommitedUtf8String);
+    return _XimProtoReset(xic, _XFree86imCommitedUtf8String);
 }
 
 Private XICMethodsRec ic_methods = {
@@ -1276,10 +1276,10 @@ Private XICMethodsRec ic_methods = {
     _XimProtoGetICValues,	/* get_values */
     _XimProtoMbReset,		/* mb_reset */
     _XimProtoWcReset,		/* wc_reset */
-    _XimProtoUtf8Reset,		/* utf8_reset */
+    _XFree86imProtoUtf8Reset,	/* utf8_reset */
     _XimProtoMbLookupString,	/* mb_lookup_string */
     _XimProtoWcLookupString,	/* wc_lookup_string */
-    _XimProtoUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imProtoUtf8LookupString	/* utf8_lookup_string */
 };
 
 Private Bool
diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c
index a2f81eea..95e267ce 100644
--- a/modules/im/ximcp/imDefIm.c
+++ b/modules/im/ximcp/imDefIm.c
@@ -1587,7 +1587,7 @@ _XimGetEncoding(
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 	    return False;
 	if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNUtf8String)))
+				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	    return False;
     }
 
@@ -1602,7 +1602,7 @@ _XimGetEncoding(
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 		    return False;
 		if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNUtf8String)))
+				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 		    return False;
 		break;
 	    } else {
@@ -1634,7 +1634,7 @@ _XimGetEncoding(
 	return False;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	return False;
     private->cstoutf8_conv = conv;
 
@@ -1642,7 +1642,7 @@ _XimGetEncoding(
 	return False;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	return False;
     private->ucstoutf8_conv = conv;
 
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index fda84cb7..4a27db6a 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -1105,7 +1105,7 @@ _XimProtoWcLookupString(
 }
 
 Public int
-_XimProtoUtf8LookupString(
+_XFree86imProtoUtf8LookupString(
     XIC			 xic,
     XKeyEvent		*ev,
     char		*buffer,
@@ -1145,7 +1145,7 @@ _XimProtoUtf8LookupString(
 	_XimUnregCommitInfo(ic);
 
     } else if (ev->type == KeyPress) {
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
 	if (ret > 0) {
            if (ret > bytes)
                *state = XBufferOverflow;
diff --git a/modules/im/ximcp/imLcIc.c b/modules/im/ximcp/imLcIc.c
index 9a65d3db..344cd4fc 100644
--- a/modules/im/ximcp/imLcIc.c
+++ b/modules/im/ximcp/imLcIc.c
@@ -125,7 +125,7 @@ Private XICMethodsRec Local_ic_methods = {
     _XimLocalMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XimLocalUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 Public XIC
diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c
index 2e622f62..bd2c941a 100644
--- a/modules/im/ximcp/imLcIm.c
+++ b/modules/im/ximcp/imLcIm.c
@@ -298,7 +298,7 @@ _XimLocalOpenIM(
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -310,7 +310,7 @@ _XimLocalOpenIM(
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -318,7 +318,7 @@ _XimLocalOpenIM(
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ucstoutf8_conv = conv;
 
diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c
index f3399aa0..ea1d84d0 100644
--- a/modules/im/ximcp/imLcLkup.c
+++ b/modules/im/ximcp/imLcLkup.c
@@ -161,7 +161,7 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
 }
 
 Public int
-_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
+_XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
     XIC		  xic;
     XKeyEvent	 *ev;
     char	 *buffer;
@@ -199,7 +199,7 @@ _XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
 	}
 	return (ret);
     } else { /* Throughed Event */
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
 	if(ret > 0) {
 	    if (ret > bytes) {
 		if (status) *status = XBufferOverflow;
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index f00d0741..646aa242 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -47,7 +47,7 @@ extern int _Xmbstowcs(
     int		len
 );
 
-extern int _Xmbstoutf8(
+extern int _XFree86mbstoUtf8(
     char	*ustr,
     const char	*str,
     int		len
@@ -584,7 +584,7 @@ parseline(
     }
     memcpy((char *)rhs_string_wc, (char *)local_wc_buf, (l + 1) * sizeof(wchar_t) );
 
-    l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
+    l = _XFree86mbstoUtf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
     if (l == LOCAL_UTF8_BUFSIZE - 1) {
 	local_wc_buf[l] = '\0';
     }
diff --git a/modules/im/ximcp/imThaiIc.c b/modules/im/ximcp/imThaiIc.c
index b67e9c14..ff9215ec 100644
--- a/modules/im/ximcp/imThaiIc.c
+++ b/modules/im/ximcp/imThaiIc.c
@@ -138,7 +138,7 @@ Private XICMethodsRec Thai_ic_methods = {
     _XimThaiMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XimLocalUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 XIC
diff --git a/modules/im/ximcp/imThaiIm.c b/modules/im/ximcp/imThaiIm.c
index 23d3a8e8..75868531 100644
--- a/modules/im/ximcp/imThaiIm.c
+++ b/modules/im/ximcp/imThaiIm.c
@@ -106,7 +106,7 @@ _XimThaiOpenIM(im)
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -118,7 +118,7 @@ _XimThaiOpenIM(im)
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -126,7 +126,7 @@ _XimThaiOpenIM(im)
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ucstoutf8_conv = conv;
 
diff --git a/modules/lc/Utf8/lcUTF8Load.c b/modules/lc/Utf8/lcUTF8Load.c
index e4fffac0..11ad5042 100644
--- a/modules/lc/Utf8/lcUTF8Load.c
+++ b/modules/lc/Utf8/lcUTF8Load.c
@@ -38,7 +38,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "XlcGeneric.h"
 
 XLCd
-_XlcUtf8Loader(
+_XFree86lcUtf8Loader(
     const char *name)
 {
     XLCd lcd;
@@ -54,8 +54,8 @@ _XlcUtf8Loader(
 	return (XLCd) NULL;
     }
 
-    _XlcAddUtf8LocaleConverters(lcd);
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8LocaleConverters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/lc/def/lcDefConv.c b/modules/lc/def/lcDefConv.c
index cbcf087f..0016991a 100644
--- a/modules/lc/def/lcDefConv.c
+++ b/modules/lc/def/lcDefConv.c
@@ -784,7 +784,7 @@ _XlcDefaultLoader(
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c
index bac71d41..1219bb57 100644
--- a/modules/lc/gen/lcGenConv.c
+++ b/modules/lc/gen/lcGenConv.c
@@ -3142,7 +3142,7 @@ _XlcGenericLoader(
     }
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/lc/xlocale/lcEuc.c b/modules/lc/xlocale/lcEuc.c
index 26f93acc..6df1d412 100644
--- a/modules/lc/xlocale/lcEuc.c
+++ b/modules/lc/xlocale/lcEuc.c
@@ -1488,7 +1488,7 @@ _XlcEucLoader(
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/lc/xlocale/lcJis.c b/modules/lc/xlocale/lcJis.c
index 161dbb28..ae23d96a 100644
--- a/modules/lc/xlocale/lcJis.c
+++ b/modules/lc/xlocale/lcJis.c
@@ -934,7 +934,7 @@ _XlcJisLoader(
     }
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/lc/xlocale/lcSjis.c b/modules/lc/xlocale/lcSjis.c
index 29e7e19e..cc629eb1 100644
--- a/modules/lc/xlocale/lcSjis.c
+++ b/modules/lc/xlocale/lcSjis.c
@@ -1556,7 +1556,7 @@ _XlcSjisLoader(
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }
diff --git a/modules/om/generic/omDefault.c b/modules/om/generic/omDefault.c
index 806ad5ce..c711604b 100644
--- a/modules/om/generic/omDefault.c
+++ b/modules/om/generic/omDefault.c
@@ -73,7 +73,7 @@ utf8_to_mbs(
     XlcConv conv;
     int to_left, ret;
 
-    conv = _XomInitConverter(oc, XOMUtf8String);
+    conv = _XomInitConverter(oc, XFree86OMUtf8String);
     if (conv == NULL)
 	return False;
 
@@ -116,7 +116,7 @@ err:
 }
 
 int
-_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
+_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -190,8 +190,9 @@ err:
 }
 
 int
-_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
-			 XRectangle *overall_ink, XRectangle *overall_logical)
+_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+			       XRectangle *overall_ink, 
+			       XRectangle *overall_logical)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -313,11 +314,12 @@ err:
 }
 
 Status
-_Xutf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-				XRectangle *ink_buf, XRectangle *logical_buf,
-				int buf_size, int *num_chars,
-				XRectangle *overall_ink,
-				XRectangle *overall_logical)
+_XFree86utf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
+				      XRectangle *ink_buf, 
+				      XRectangle *logical_buf,
+				      int buf_size, int *num_chars,
+				      XRectangle *overall_ink,
+				      XRectangle *overall_logical)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -378,8 +380,8 @@ err:
 }
 
 int
-_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-			_Xconst char *text, int length)
+_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+			      int x, int y, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -429,8 +431,8 @@ err:
 }
 
 void
-_Xutf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			     int y, _Xconst char *text, int length)
+_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+				   int x, int y, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c
index 331c2aa5..f1206595 100644
--- a/modules/om/generic/omGeneric.c
+++ b/modules/om/generic/omGeneric.c
@@ -66,26 +66,26 @@
 
 #if 0
 extern int _XmbDefaultTextEscapement(), _XwcDefaultTextEscapement(),
-	   _Xutf8DefaultTextEscapement();
+	   _XFree86utf8DefaultTextEscapement();
 extern int _XmbDefaultTextExtents(), _XwcDefaultTextExtents(),
-	   _Xutf8DefaultTextExtents();
+	   _XFree86utf8DefaultTextExtents();
 extern Status _XmbDefaultTextPerCharExtents(), _XwcDefaultTextPerCharExtents(),
-	      _Xutf8DefaultTextPerCharExtents();
+	      _XFree86utf8DefaultTextPerCharExtents();
 extern int _XmbDefaultDrawString(), _XwcDefaultDrawString(),
-	   _Xutf8DefaultDrawString();
+	   _XFree86utf8DefaultDrawString();
 extern void _XmbDefaultDrawImageString(), _XwcDefaultDrawImageString(),
-	    _Xutf8DefaultDrawImageString();
+	    _XFree86utf8DefaultDrawImageString();
 
 extern int _XmbGenericTextEscapement(), _XwcGenericTextEscapement(),
-	   _Xutf8GenericTextEscapement();
+	   _XFree86utf8GenericTextEscapement();
 extern int _XmbGenericTextExtents(), _XwcGenericTextExtents(),
-	   _Xutf8GenericTextExtents();
+	   _XFree86utf8GenericTextExtents();
 extern Status _XmbGenericTextPerCharExtents(), _XwcGenericTextPerCharExtents(),
-	      _Xutf8GenericTextPerCharExtents();
+	      _XFree86utf8GenericTextPerCharExtents();
 extern int _XmbGenericDrawString(), _XwcGenericDrawString(),
-	   _Xutf8GenericDrawString();
+	   _XFree86utf8GenericDrawString();
 extern void _XmbGenericDrawImageString(), _XwcGenericDrawImageString(),
-	    _Xutf8GenericDrawImageString();
+	    _XFree86utf8GenericDrawImageString();
 
 extern void _XlcDbg_printValue (const char *str, char **value, int num);
 #endif
@@ -1583,11 +1583,11 @@ static XOCMethodsRec oc_default_methods = {
     _XwcDefaultTextPerCharExtents,
     _XwcDefaultDrawString,
     _XwcDefaultDrawImageString,
-    _Xutf8DefaultTextEscapement,
-    _Xutf8DefaultTextExtents,
-    _Xutf8DefaultTextPerCharExtents,
-    _Xutf8DefaultDrawString,
-    _Xutf8DefaultDrawImageString
+    _XFree86utf8DefaultTextEscapement,
+    _XFree86utf8DefaultTextExtents,
+    _XFree86utf8DefaultTextPerCharExtents,
+    _XFree86utf8DefaultDrawString,
+    _XFree86utf8DefaultDrawImageString
 };
 
 static XOCMethodsRec oc_generic_methods = {
@@ -1604,11 +1604,11 @@ static XOCMethodsRec oc_generic_methods = {
     _XwcGenericTextPerCharExtents,
     _XwcGenericDrawString,
     _XwcGenericDrawImageString,
-    _Xutf8GenericTextEscapement,
-    _Xutf8GenericTextExtents,
-    _Xutf8GenericTextPerCharExtents,
-    _Xutf8GenericDrawString,
-    _Xutf8GenericDrawImageString
+    _XFree86utf8GenericTextEscapement,
+    _XFree86utf8GenericTextExtents,
+    _XFree86utf8GenericTextPerCharExtents,
+    _XFree86utf8GenericDrawString,
+    _XFree86utf8GenericDrawImageString
 };
 
 typedef struct _XOCMethodsListRec {
diff --git a/modules/om/generic/omImText.c b/modules/om/generic/omImText.c
index 30667868..1dff788f 100644
--- a/modules/om/generic/omImText.c
+++ b/modules/om/generic/omImText.c
@@ -81,9 +81,9 @@ _XwcGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
 }
 
 void
-_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			     int y, _Xconst char *text, int length)
+_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+				   int x, int y, _Xconst char *text, int length)
 {
-    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMUtf8String,
+    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
 			       (XPointer) text, length);
 }
diff --git a/modules/om/generic/omText.c b/modules/om/generic/omText.c
index 6d6c41f8..46d529fc 100644
--- a/modules/om/generic/omText.c
+++ b/modules/om/generic/omText.c
@@ -361,9 +361,9 @@ _XwcGenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
 }
 
 int
-_Xutf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-			_Xconst char *text, int length)
+_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+			      int x, int y, _Xconst char *text, int length)
 {
-    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XOMUtf8String,
+    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
 				 (XPointer) text, length);
 }
diff --git a/modules/om/generic/omTextEsc.c b/modules/om/generic/omTextEsc.c
index 84ccbf3a..088132b6 100644
--- a/modules/om/generic/omTextEsc.c
+++ b/modules/om/generic/omTextEsc.c
@@ -292,8 +292,8 @@ _XwcGenericTextEscapement(XOC oc, _Xconst wchar_t *text, int length)
 }
 
 int
-_Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
+_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
 {
-    return _XomGenericTextEscapement(oc, XOMUtf8String, (XPointer) text,
+    return _XomGenericTextEscapement(oc, XFree86OMUtf8String, (XPointer) text,
 				     length);
 }
diff --git a/modules/om/generic/omTextExt.c b/modules/om/generic/omTextExt.c
index 275df91c..ddff807e 100644
--- a/modules/om/generic/omTextExt.c
+++ b/modules/om/generic/omTextExt.c
@@ -126,9 +126,9 @@ _XwcGenericTextExtents(XOC oc, _Xconst wchar_t *text, int length,
 }
 
 int
-_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
 			 XRectangle *overall_ink, XRectangle *overall_logical)
 {
-    return _XomGenericTextExtents(oc, XOMUtf8String, (XPointer) text, length,
-				  overall_ink, overall_logical);
+    return _XomGenericTextExtents(oc, XFree86OMUtf8String, (XPointer) text, 
+		    		  length, overall_ink, overall_logical);
 }
diff --git a/modules/om/generic/omTextPer.c b/modules/om/generic/omTextPer.c
index d6dec28f..521e31fd 100644
--- a/modules/om/generic/omTextPer.c
+++ b/modules/om/generic/omTextPer.c
@@ -188,14 +188,15 @@ _XwcGenericTextPerCharExtents(XOC oc, _Xconst wchar_t *text, int length,
 }
 
 Status
-_Xutf8GenericTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-				XRectangle *ink_buf, XRectangle *logical_buf,
-				int buf_size, int *num_chars,
-				XRectangle *overall_ink,
-				XRectangle *overall_logical)
+_XFree86utf8GenericTextPerCharExtents(XOC oc, _Xconst char *text, int length,
+				      XRectangle *ink_buf, 
+				      XRectangle *logical_buf,
+				      int buf_size, int *num_chars,
+				      XRectangle *overall_ink,
+				      XRectangle *overall_logical)
 {
-    return _XomGenericTextPerCharExtents(oc, XOMUtf8String, (XPointer) text,
-					 length, ink_buf, logical_buf, buf_size,
-					 num_chars, overall_ink,
-					 overall_logical);
+    return _XomGenericTextPerCharExtents(oc, XFree86OMUtf8String, 
+		    			 (XPointer) text, length, ink_buf, 
+					 logical_buf, buf_size, num_chars, 
+					 overall_ink, overall_logical);
 }
diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c
index 87148063..e05ba3f1 100644
--- a/modules/om/generic/omXChar.c
+++ b/modules/om/generic/omXChar.c
@@ -448,9 +448,9 @@ _XomInitConverter(
 	convp = &gen->mbs_to_cs;
 	conv_type = XlcNMultiByte;
 	break;
-    case XOMUtf8String:
+    case XFree86OMUtf8String:
 	convp = &gen->utf8_to_cs;
-	conv_type = XlcNUtf8String;
+	conv_type = XFree86lcNUtf8String;
 	break;
     default:
 	return (XlcConv) NULL;
diff --git a/src/XomGeneric.h b/src/XomGeneric.h
index 9b547495..85f25ff6 100644
--- a/src/XomGeneric.h
+++ b/src/XomGeneric.h
@@ -61,7 +61,7 @@ typedef struct _VRotateRec {
 typedef enum {
     XOMMultiByte,
     XOMWideChar,
-    XOMUtf8String
+    XFree86OMUtf8String
 } XOMTextType;
 
 typedef struct _FontDataRec {
@@ -178,7 +178,7 @@ _XmbDefaultTextEscapement(XOC oc, _Xconst char *text, int length);
 extern int
 _XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length);
 extern int
-_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length);
+_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length);
 extern int
 _XmbDefaultTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
@@ -186,7 +186,7 @@ extern int
 _XwcDefaultTextExtents(XOC oc, _Xconst wchar_t *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern Status
 _XmbDefaultTextPerCharExtents(
@@ -203,7 +203,7 @@ _XwcDefaultTextPerCharExtents(
     XRectangle *overall_ink,
     XRectangle *overall_logical);
 extern Status
-_Xutf8DefaultTextPerCharExtents(
+_XFree86utf8DefaultTextPerCharExtents(
     XOC oc, _Xconst char *text, int length,
     XRectangle *ink_buf, XRectangle *logical_buf,
     int buf_size, int *num_chars,
@@ -216,8 +216,8 @@ extern int
 _XwcDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
     _Xconst wchar_t *text, int length);
 extern int
-_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-    _Xconst char *text, int length);
+_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern void
 _XmbDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst char *text, int length);
@@ -225,8 +225,8 @@ extern void
 _XwcDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst wchar_t *text, int length);
 extern void
-_Xutf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-    int y, _Xconst char *text, int length);
+_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 
 extern int
 _XmbGenericTextEscapement(XOC oc, _Xconst char *text, int length);
@@ -234,23 +234,23 @@ extern int
 _XmbGenericTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-    _Xconst char *text, int length);
+_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern void
-_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-    int y, _Xconst char *text, int length);
+_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern Status
-_Xutf8GenericTextPerCharExtents(
+_XFree86utf8GenericTextPerCharExtents(
     XOC oc, _Xconst char *text, int length,
     XRectangle *ink_buf, XRectangle *logical_buf,
     int buf_size, int *num_chars,
     XRectangle *overall_ink,
     XRectangle *overall_logical);
 extern int
-_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length);
+_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length);
 extern void
 _XwcGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst wchar_t *text, int length);
diff --git a/src/imConv.c b/src/imConv.c
index b77eaae7..d3a87a42 100644
--- a/src/imConv.c
+++ b/src/imConv.c
@@ -84,12 +84,12 @@ XPointer
 _XimGetLocaleCode (
     _Xconst char*	encoding_name)
 {
-    XPointer cvt = _Utf8GetConvByName(encoding_name);
+    XPointer cvt = _XFree86utf8GetConvByName(encoding_name);
     if (!cvt && encoding_name) {
        int i;
        for (i = 0; i < num_substitute; i++)
            if (!strcmp(encoding_name, SubstTable[i].encoding_name))
-               return _Utf8GetConvByName(SubstTable[i].charset_name);
+               return _XFree86utf8GetConvByName(SubstTable[i].charset_name);
     }
     return cvt;
 }
@@ -298,7 +298,7 @@ _XimLookupWCText(ic, event, buffer, nbytes, keysym, status)
 }
 
 int
-_XimLookupUTF8Text(ic, event, buffer, nbytes, keysym, status)
+_XFree86imLookupUtf8Text(ic, event, buffer, nbytes, keysym, status)
     Xic			 ic;
     XKeyEvent*		event;
     char*		buffer;
diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
index 9b635199..d78bd8cf 100644
--- a/src/xlibi18n/ICWrap.c
+++ b/src/xlibi18n/ICWrap.c
@@ -391,7 +391,7 @@ XwcResetIC(ic)
 }
 
 char *
-Xutf8ResetIC(ic)
+XFree86utf8ResetIC(ic)
     XIC ic;
 {
     if (ic->core.im) {
@@ -434,7 +434,7 @@ XwcLookupString(ic, ev, buffer, nchars, keysym, status)
 }
 
 int
-Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
+XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status)
     XIC ic;
     register XKeyEvent *ev;
     char *buffer;
diff --git a/src/xlibi18n/Ximint.h b/src/xlibi18n/Ximint.h
index 3809c658..d52e4fdb 100644
--- a/src/xlibi18n/Ximint.h
+++ b/src/xlibi18n/Ximint.h
@@ -705,7 +705,7 @@ extern int	_XimProtoWcLookupString(
     Status	*state
 );
 
-extern int	_XimProtoUtf8LookupString(
+extern int	_XFree86imProtoUtf8LookupString(
     XIC		 xic,
     XKeyEvent	*ev,
     char	*buffer,
@@ -764,7 +764,7 @@ extern int	_XimLookupWCText(
     XComposeStatus	*status
 );
 
-extern int	_XimLookupUTF8Text(
+extern int	_XFree86imLookupUtf8Text(
     Xic			 ic,
     XKeyEvent		*event,
     char		*buffer,
@@ -915,7 +915,7 @@ extern int _XimLocalWcLookupString(
     Status		*status
 );
 
-extern int _XimLocalUtf8LookupString(
+extern int _XFree86imLocalUtf8LookupString(
     XIC			 ic,
     XKeyEvent		*ev,
     char		*buffer,
diff --git a/src/xlibi18n/XlcPubI.h b/src/xlibi18n/XlcPubI.h
index 64504eaf..676e1c77 100644
--- a/src/xlibi18n/XlcPubI.h
+++ b/src/xlibi18n/XlcPubI.h
@@ -156,7 +156,7 @@ extern int _XwcTextPropertyToTextList(
     int*		count_ret
 );
 
-extern int _Xutf8TextPropertyToTextList(
+extern int _XFree86utf8TextPropertyToTextList(
     XLCd		lcd,
     Display*		dpy,
     const XTextProperty* text_prop,
@@ -182,7 +182,7 @@ extern int _XwcTextListToTextProperty(
     XTextProperty*	/* text_prop */
 );
 
-extern int _Xutf8TextListToTextProperty(
+extern int _XFree86utf8TextListToTextProperty(
     XLCd		/* lcd */,
     Display*		/* dpy */,
     char**		/* list */,
@@ -240,12 +240,12 @@ extern char *_XlcMapOSLocaleName(
 #endif
 
 extern int
-_Xmbstoutf8(
+_XFree86mbstoutf8(
     char *ustr,
     const char *str,
     int len);
 extern int
-_Xlcmbstoutf8(
+_XFree86lcmbstoutf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -287,7 +287,7 @@ _Xlcwctomb(
 
 
 extern XPointer
-_Utf8GetConvByName(
+_XFree86utf8GetConvByName(
     const char *name);
 
 _XFUNCPROTOEND
diff --git a/src/xlibi18n/XlcPublic.h b/src/xlibi18n/XlcPublic.h
index 72df4c8e..1a328c4c 100644
--- a/src/xlibi18n/XlcPublic.h
+++ b/src/xlibi18n/XlcPublic.h
@@ -206,7 +206,7 @@ typedef struct _XlcConvMethodsRec{
 #define XlcNWideChar 		"wideChar"
 #define XlcNCompoundText 	"compoundText"
 #define XlcNString 		"string"
-#define XlcNUtf8String 		"utf8String"
+#define XFree86lcNUtf8String 	"utf8String"
 #define XlcNCharSet 		"charSet"
 #define XlcNCTCharSet 		"CTcharSet"
 #define XlcNFontCharSet		"FontCharSet"
diff --git a/src/xlibi18n/Xlcint.h b/src/xlibi18n/Xlcint.h
index fe3b8c95..b88f0d46 100644
--- a/src/xlibi18n/Xlcint.h
+++ b/src/xlibi18n/Xlcint.h
@@ -903,12 +903,12 @@ extern void _XlcRemoveLoader(
 );
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
-extern void _XlcAddUtf8Converters(
+extern void _XFree86lcAddUtf8Converters(
     XLCd		lcd
 );
 
 /* Registers UTF-8 converters for a UTF-8 locale. */
-extern void _XlcAddUtf8LocaleConverters(
+extern void _XFree86lcAddUtf8LocaleConverters(
     XLCd		lcd
 );
 
@@ -925,7 +925,7 @@ extern XLCd _XlcGenericLoader(
 
 /* The UTF-8 locale loader. Suitable for UTF-8 encoding.
    Uses an XLC_LOCALE configuration file. */
-extern XLCd _XlcUtf8Loader(
+extern XLCd _XFree86lcUtf8Loader(
     const char*		name
 );
 
diff --git a/src/xlibi18n/lcInit.c b/src/xlibi18n/lcInit.c
index cfa2b076..d340ad82 100644
--- a/src/xlibi18n/lcInit.c
+++ b/src/xlibi18n/lcInit.c
@@ -116,7 +116,7 @@ _XlcInitLoader()
 #endif
 
 #ifdef USE_UTF8_LOADER
-    _XlcAddLoader(_XlcUtf8Loader, XlcHead);
+    _XlcAddLoader(_XFree86lcUtf8Loader, XlcHead);
 #endif
 
 #ifdef USE_EUC_LOADER
@@ -155,7 +155,7 @@ _XlcDeInitLoader()
 #endif
 
 #ifdef USE_UTF8_LOADER
-    _XlcRemoveLoader(_XlcUtf8Loader);
+    _XlcRemoveLoader(_XFree86lcUtf8Loader);
 #endif
 
 #ifdef USE_EUC_LOADER
diff --git a/src/xlibi18n/lcPrTxt.c b/src/xlibi18n/lcPrTxt.c
index 9078b9be..23253dab 100644
--- a/src/xlibi18n/lcPrTxt.c
+++ b/src/xlibi18n/lcPrTxt.c
@@ -139,7 +139,7 @@ _XTextPropertyToTextList(
     if (encoding == XA_STRING)
 	from_type = XlcNString;
     else if (encoding == XInternAtom(dpy, "UTF8_STRING", False))
-	from_type = XlcNUtf8String;
+	from_type = XFree86lcNUtf8String;
     else if (encoding == XInternAtom(dpy, "COMPOUND_TEXT", False))
 	from_type = XlcNCompoundText;
     else if (encoding == XInternAtom(dpy, XLC_PUBLIC(lcd, encoding_name), False))
@@ -150,7 +150,7 @@ _XTextPropertyToTextList(
     if (is_wide_char) {
 	buf_len = (text_prop->nitems + 1) * sizeof(wchar_t);;
     } else {
-	if (strcmp(to_type, XlcNUtf8String) == 0)
+	if (strcmp(to_type, XFree86lcNUtf8String) == 0)
 	    buf_len = text_prop->nitems * 6 + 1;
 	else
 	    buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
@@ -162,7 +162,7 @@ _XTextPropertyToTextList(
     to_left = buf_len;
 
     /* can be XlcNMultiByte to XlcNMultiByte,
-       or XlcNUtf8String to XlcNUtf8String */
+       or XFree86lcNUtf8String to XFree86lcNUtf8String */
     if (!strcmp(from_type, to_type)) {
         do_strcpy = True;
     } else {
@@ -265,14 +265,14 @@ _XwcTextPropertyToTextList(
 }
 
 int
-_Xutf8TextPropertyToTextList(
+_XFree86utf8TextPropertyToTextList(
     XLCd lcd,
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
     int *count_ret)
 {
-    return _XTextPropertyToTextList(lcd, dpy, text_prop, XlcNUtf8String,
+    return _XTextPropertyToTextList(lcd, dpy, text_prop, XFree86lcNUtf8String,
 				    (XPointer **) list_ret, count_ret);
 }
 
diff --git a/src/xlibi18n/lcPublic.c b/src/xlibi18n/lcPublic.c
index 80459d6e..fac7d1d4 100644
--- a/src/xlibi18n/lcPublic.c
+++ b/src/xlibi18n/lcPublic.c
@@ -50,10 +50,10 @@ static XLCdPublicMethodsRec publicMethods = {
 	_XrmDefaultInitParseInfo,
 	_XmbTextPropertyToTextList,
 	_XwcTextPropertyToTextList,
-	_Xutf8TextPropertyToTextList,
+	_XFree86utf8TextPropertyToTextList,
 	_XmbTextListToTextProperty,
 	_XwcTextListToTextProperty,
-	_Xutf8TextListToTextProperty,
+	_XFree86utf8TextListToTextProperty,
 	_XwcFreeStringList,
 	default_string,
 	NULL,
diff --git a/src/xlibi18n/lcStd.c b/src/xlibi18n/lcStd.c
index b8e5ae4c..ac64791e 100644
--- a/src/xlibi18n/lcStd.c
+++ b/src/xlibi18n/lcStd.c
@@ -319,7 +319,7 @@ _Xwcsncmp(
 
 
 int
-_Xlcmbstoutf8(
+_XFree86lcmbstoUtf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -335,7 +335,7 @@ _Xlcmbstoutf8(
 	    return -1;
     }
 
-    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String);
+    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String);
     if (conv == NULL)
 	return -1;
 
@@ -358,10 +358,10 @@ _Xlcmbstoutf8(
 }
 
 int
-_Xmbstoutf8(
+_XFree86mbstoUtf8(
     char *ustr,
     const char *str,
     int len)
 {
-    return _Xlcmbstoutf8((XLCd) NULL, ustr, str, len);
+    return _XFree86lcmbstoUtf8((XLCd) NULL, ustr, str, len);
 }
diff --git a/src/xlibi18n/lcTxtPr.c b/src/xlibi18n/lcTxtPr.c
index 25e03c8a..50c102ae 100644
--- a/src/xlibi18n/lcTxtPr.c
+++ b/src/xlibi18n/lcTxtPr.c
@@ -97,9 +97,9 @@ _XTextListToTextProperty(
 	    encoding = XA_STRING;
 	    to_type = XlcNString;
 	    break;
-	case XUTF8StringStyle:
+	case XFree86Utf8StringStyle:
 	    encoding = XInternAtom(dpy, "UTF8_STRING", False);
-	    to_type = XlcNUtf8String;
+	    to_type = XFree86lcNUtf8String;
 	    break;
 	case XCompoundTextStyle:
 	    encoding = XInternAtom(dpy, "COMPOUND_TEXT", False);
@@ -240,7 +240,7 @@ _XwcTextListToTextProperty(
 }
 
 int
-_Xutf8TextListToTextProperty(
+_XFree86utf8TextListToTextProperty(
     XLCd lcd,
     Display *dpy,
     char **list,
@@ -248,6 +248,6 @@ _Xutf8TextListToTextProperty(
     XICCEncodingStyle style,
     XTextProperty *text_prop)
 {
-    return _XTextListToTextProperty(lcd, dpy, XlcNUtf8String, (XPointer) list,
-				    count, style, text_prop);
+    return _XTextListToTextProperty(lcd, dpy, XFree86lcNUtf8String, 
+		    		    (XPointer) list, count, style, text_prop);
 }
diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
index cc51c30e..10ecf12b 100644
--- a/src/xlibi18n/lcUTF8.c
+++ b/src/xlibi18n/lcUTF8.c
@@ -371,8 +371,7 @@ init_all_charsets (void)
 	    init_all_charsets();					\
     } while (0)
 
-/* from XlcNCharSet to XlcNUtf8String */
-
+/* from XlcNCharSet to XFree86lcNUtf8String */ 
 static int
 cstoutf8(
     XlcConv conv,
@@ -464,7 +463,7 @@ open_cstoutf8(
     return create_conv(from_lcd, &methods_cstoutf8);
 }
 
-/* from XlcNUtf8String to XlcNCharSet */
+/* from XFree86lcNUtf8String to XlcNCharSet */
 
 static XlcConv
 create_tocs_conv(
@@ -678,7 +677,7 @@ open_utf8tocs(
     return create_tocs_conv(from_lcd, &methods_utf8tocs);
 }
 
-/* from XlcNUtf8String to XlcNChar */
+/* from XFree86lcNUtf8String to XlcNChar */
 
 static int
 utf8tocs1(
@@ -782,7 +781,7 @@ open_utf8tocs1(
     return create_tocs_conv(from_lcd, &methods_utf8tocs1);
 }
 
-/* from XlcNUtf8String to XlcNString */
+/* from XFree86lcNUtf8String to XlcNString */
 
 static int
 utf8tostr(
@@ -858,7 +857,7 @@ open_utf8tostr(
     return create_conv(from_lcd, &methods_utf8tostr);
 }
 
-/* from XlcNString to XlcNUtf8String */
+/* from XlcNString to XFree86lcNUtf8String */
 
 static int
 strtoutf8(
@@ -918,7 +917,7 @@ open_strtoutf8(
 /* Support for the input methods. */
 
 XPointer
-_Utf8GetConvByName(
+_XFree86utf8GetConvByName(
     const char *name)
 {
     XrmQuark xrm_name;
@@ -1056,7 +1055,7 @@ open_ucstocs1(
     return create_ucstocs_conv(from_lcd, &methods_ucstocs1);
 }
 
-/* from XlcNUcsChar to XlcNUtf8String, needed for input methods */
+/* from XlcNUcsChar to XFree86lcNUtf8String, needed for input methods */
 
 static int
 ucstoutf8(
@@ -1119,16 +1118,16 @@ open_ucstoutf8(
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
 void
-_XlcAddUtf8Converters(
+_XFree86lcAddUtf8Converters(
     XLCd lcd)
 {
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String, open_cstoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNCharSet, open_utf8tocs);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNChar, open_utf8tocs1);
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNUtf8String, open_strtoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNString, open_utf8tostr);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String, open_cstoutf8);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNCharSet, open_utf8tocs);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNChar, open_utf8tocs1);
+    _XlcSetConverter(lcd, XlcNString, lcd, XFree86lcNUtf8String, open_strtoutf8);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNString, open_utf8tostr);
     _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XlcNChar, open_ucstocs1);
-    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XlcNUtf8String, open_ucstoutf8);
+    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XFree86lcNUtf8String, open_ucstoutf8);
 }
 
 /***************************************************************************/
@@ -1756,7 +1755,7 @@ create_tofontcs_conv(
 		if (!strcmp(preferred[k]->name, name))
 		    break;
 	    if (k < 0) {
-                /* For fonts "ISO10646-1" means not utf8 but ucs2.*/
+                /* For fonts "ISO10646-1" means ucs2, not utf8.*/
                 if (!strcmp("ISO10646-1", name)) {
                     preferred[num++] = &all_charsets[ucs2_conv_index];
                     continue;
@@ -1802,7 +1801,7 @@ open_utf8tofcs(
 /* Registers UTF-8 converters for a UTF-8 locale. */
 
 void
-_XlcAddUtf8LocaleConverters(
+_XFree86lcAddUtf8LocaleConverters(
     XLCd lcd)
 {
     /* Register elementary converters. */
@@ -1827,8 +1826,8 @@ _XlcAddUtf8LocaleConverters(
 
     _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtoutf8);
     _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_utf8tostr);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNMultiByte, open_identity);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String, open_identity);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNMultiByte, open_identity);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String, open_identity);
 
     /* Register converters for XlcNFontCharSet */
     _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNFontCharSet, open_utf8tofcs);
diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
index ef203420..69d073ac 100644
--- a/src/xlibi18n/lcWrap.c
+++ b/src/xlibi18n/lcWrap.c
@@ -406,7 +406,7 @@ XwcTextPropertyToTextList(
 }
 
 int
-Xutf8TextPropertyToTextList(
+XFree86utf8TextPropertyToTextList(
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
@@ -456,7 +456,7 @@ XwcTextListToTextProperty(
 }
 
 int
-Xutf8TextListToTextProperty(
+XFree86utf8TextListToTextProperty(
     Display *dpy,
     char **list,
     int count,
diff --git a/src/xlibi18n/utf8WMProps.c b/src/xlibi18n/utf8WMProps.c
index 11a224d0..93fb552b 100644
--- a/src/xlibi18n/utf8WMProps.c
+++ b/src/xlibi18n/utf8WMProps.c
@@ -56,7 +56,7 @@ from The Open Group.
 #include <X11/Xlocale.h>
 
 void
-Xutf8SetWMProperties (
+XFree86utf8SetWMProperties (
     Display *dpy,
     Window w,
     _Xconst char *windowName,
@@ -72,11 +72,11 @@ Xutf8SetWMProperties (
     XTextProperty *iprop = NULL;
 
     if (windowName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&windowName, 1,
+	XFree86utf8TextListToTextProperty(dpy, (char**)&windowName, 1,
 				    XStdICCTextStyle, &wname) >= Success)
 	wprop = &wname;
     if (iconName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&iconName, 1,
+	XFree86utf8TextListToTextProperty(dpy, (char**)&iconName, 1,
 				    XStdICCTextStyle, &iname) >= Success)
 	iprop = &iname;
     XSetWMProperties(dpy, w, wprop, iprop, argv, argc,
diff --git a/src/xlibi18n/utf8Wrap.c b/src/xlibi18n/utf8Wrap.c
index 70cc8a6e..54603235 100644
--- a/src/xlibi18n/utf8Wrap.c
+++ b/src/xlibi18n/utf8Wrap.c
@@ -78,7 +78,7 @@ from The Open Group.
 #include "Xlcint.h"
 
 void
-Xutf8DrawText(
+XFree86utf8DrawText(
     Display            *dpy,
     Drawable            d,
     GC                  gc,
@@ -111,7 +111,7 @@ Xutf8DrawText(
 }
 
 void
-Xutf8DrawString(
+XFree86utf8DrawString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -127,7 +127,7 @@ Xutf8DrawString(
 
 
 void
-Xutf8DrawImageString(
+XFree86utf8DrawImageString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -142,7 +142,7 @@ Xutf8DrawImageString(
 }
 
 int 
-Xutf8TextEscapement(
+XFree86utf8TextEscapement(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len)
@@ -152,7 +152,7 @@ Xutf8TextEscapement(
 }
 
 int
-Xutf8TextExtents(
+XFree86utf8TextExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,
@@ -166,7 +166,7 @@ Xutf8TextExtents(
 }
 
 Status
-Xutf8TextPerCharExtents(
+XFree86utf8TextPerCharExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,