diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 7c6f2eaa..a83bcd5f 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -651,7 +651,7 @@ load_config (void)
 	username = convert_with_fallback (username, "username");
 	realname = convert_with_fallback (realname, "realname");
 
-	memset (&prefs, 0, sizeof (struct xchatprefs));
+	memset (&prefs, 0, sizeof (struct hexchatprefs));
 
 	/* put in default values, anything left out is automatically zero */
 	prefs.local_ip = 0xffffffff;
diff --git a/src/common/cfgfiles.h b/src/common/cfgfiles.h
index 984b9472..2cb4a4e2 100644
--- a/src/common/cfgfiles.h
+++ b/src/common/cfgfiles.h
@@ -35,10 +35,10 @@ FILE *xchat_fopen_file (const char *file, const char *mode, int xof_flags);
 #define STRUCT_OFFSET_INT(type,field) \
 ( (unsigned int) (((int *) (&(((type *) NULL)->field)))- ((int *) NULL)) )
 
-#define P_OFFSET(field) STRUCT_OFFSET_STR(struct xchatprefs, field),sizeof(prefs.field)
-#define P_OFFSETNL(field) STRUCT_OFFSET_STR(struct xchatprefs, field)
-#define P_OFFINT(field) STRUCT_OFFSET_INT(struct xchatprefs, field),0
-#define P_OFFINTNL(field) STRUCT_OFFSET_INT(struct xchatprefs, field)
+#define P_OFFSET(field) STRUCT_OFFSET_STR(struct hexchatprefs, field),sizeof(prefs.field)
+#define P_OFFSETNL(field) STRUCT_OFFSET_STR(struct hexchatprefs, field)
+#define P_OFFINT(field) STRUCT_OFFSET_INT(struct hexchatprefs, field),0
+#define P_OFFINTNL(field) STRUCT_OFFSET_INT(struct hexchatprefs, field)
 
 struct prefs
 {
diff --git a/src/common/xchat.c b/src/common/xchat.c
index d6ccf301..9164be6f 100644
--- a/src/common/xchat.c
+++ b/src/common/xchat.c
@@ -93,7 +93,7 @@ gint arg_existing = FALSE;
 
 struct session *current_tab;
 struct session *current_sess = 0;
-struct xchatprefs prefs;
+struct hexchatprefs prefs;
 
 #ifdef USE_OPENSSL
 SSL_CTX *ctx = NULL;
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 5921999e..ad95256d 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -102,7 +102,7 @@ struct nbexec
 	struct session *sess;
 };
 
-struct xchatprefs
+struct hexchatprefs
 {
 	char nick1[NICKLEN];
 	char nick2[NICKLEN];
diff --git a/src/common/xchatc.h b/src/common/xchatc.h
index c22e17dd..1d955055 100644
--- a/src/common/xchatc.h
+++ b/src/common/xchatc.h
@@ -1,7 +1,7 @@
 #ifndef XCHAT_C_H
 #define XCHAT_C_H
 
-extern struct xchatprefs prefs;
+extern struct hexchatprefs prefs;
 
 extern int xchat_is_quitting;
 extern gint arg_skip_plugins;	/* command-line args */
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index a727de7f..8459d749 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -66,7 +66,7 @@ GtkStyle *create_input_style (GtkStyle *);
 static int last_selected_page = 0;
 static int last_selected_row = 0; /* sound row */
 static gboolean color_change;
-static struct xchatprefs setup_prefs;
+static struct hexchatprefs setup_prefs;
 static GtkWidget *cancel_button;
 static GtkWidget *font_dialog = NULL;
 
@@ -2182,7 +2182,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout)
 }
 
 static void
-setup_apply (struct xchatprefs *pr)
+setup_apply (struct hexchatprefs *pr)
 {
 #ifdef WIN32
 	PangoFontDescription *old_desc;