diff --git a/src/dialogs/togglebutton.c b/src/dialogs/togglebutton.c
index d69806a..b567876 100644
--- a/src/dialogs/togglebutton.c
+++ b/src/dialogs/togglebutton.c
@@ -43,9 +43,9 @@
  {
  	GtkToggleButton parent;
 
- 	H3270			* hSession;
- 	LIB3270_TOGGLE	  id;
- 	const void		* hListener;
+ 	H3270				* hSession;
+ 	LIB3270_TOGGLE_ID	  id;
+ 	const void			* hListener;
 
  };
 
@@ -98,13 +98,13 @@
  {
  }
 
- static void toggle_listener(H3270 G_GNUC_UNUSED(*hSession), LIB3270_TOGGLE toggle, char state, void *button)
+ static void toggle_listener(H3270 G_GNUC_UNUSED(*hSession), LIB3270_TOGGLE_ID toggle, char state, void *button)
  {
  	g_message("%s is %s\n", lib3270_get_toggle_name(toggle),(state ? "ON" : "OFF"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),(state == 0 ? FALSE : TRUE));
  }
 
- GtkWidget * v3270_toggle_button_new(GtkWidget *terminal, LIB3270_TOGGLE toggle)
+ GtkWidget * v3270_toggle_button_new(GtkWidget *terminal, LIB3270_TOGGLE_ID toggle)
  {
  	g_return_val_if_fail(GTK_IS_V3270(terminal),NULL);
 
diff --git a/src/include/internals.h b/src/include/internals.h
index e539960..30ef00b 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -122,7 +122,7 @@
  typedef struct _V3270ToggleButton		V3270ToggleButton;
  typedef struct _V3270ToggleButtonClass	V3270ToggleButtonClass;
 
- G_GNUC_INTERNAL GtkWidget * v3270_toggle_button_new(GtkWidget *widget, LIB3270_TOGGLE toggle);
+ G_GNUC_INTERNAL GtkWidget * v3270_toggle_button_new(GtkWidget *widget, LIB3270_TOGGLE_ID toggle);
 
  // Activity list widget.
  #define GTK_TYPE_V3270_FT_ACTIVITY_LIST				(V3270FTActivityList_get_type ())
diff --git a/src/include/terminal.h b/src/include/terminal.h
index 88b18b2..6c12f19 100644
--- a/src/include/terminal.h
+++ b/src/include/terminal.h
@@ -69,7 +69,7 @@ G_BEGIN_DECLS
 
 	// Signals
 	void (*activate)(GtkWidget *widget);
-	void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE toggle_id,gboolean toggle_state,const gchar *toggle_name);
+	void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE_ID toggle_id,gboolean toggle_state,const gchar *toggle_name);
 	void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id);
 	void (*popup_message)(GtkWidget *widget, LIB3270_NOTIFY id , const gchar *title, const gchar *message, const gchar *text);
 
diff --git a/src/include/v3270/toggle.h b/src/include/v3270/toggle.h
index 4dbdc1c..d1c5c01 100644
--- a/src/include/v3270/toggle.h
+++ b/src/include/v3270/toggle.h
@@ -36,8 +36,8 @@
 
  G_BEGIN_DECLS
 
- LIB3270_EXPORT gboolean	v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);
- LIB3270_EXPORT gboolean	v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE ix, gboolean state);
+ LIB3270_EXPORT gboolean	v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix);
+ LIB3270_EXPORT gboolean	v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix, gboolean state);
 
  G_END_DECLS
 
diff --git a/src/terminal/callbacks.c b/src/terminal/callbacks.c
index 11c3542..d0e53b0 100644
--- a/src/terminal/callbacks.c
+++ b/src/terminal/callbacks.c
@@ -70,7 +70,7 @@ static void set_timer(H3270 *session, unsigned char on)
 
 }
 
-static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name)
+static void update_toggle(H3270 *session, LIB3270_TOGGLE_ID ix, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name)
 {
 	GtkWidget	* widget = GTK_WIDGET(lib3270_get_user_data(session));
  	v3270Class	* klass = GTK_V3270_GET_CLASS(widget);
diff --git a/src/terminal/properties/methods.c b/src/terminal/properties/methods.c
index f473a5a..7b96f4d 100644
--- a/src/terminal/properties/methods.c
+++ b/src/terminal/properties/methods.c
@@ -43,7 +43,7 @@
  	return GTK_V3270(widget)->activity.disconnect;
  }
 
-LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
+LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix)
 {
 	g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
 
@@ -53,7 +53,7 @@ LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
 	return FALSE;
 }
 
-LIB3270_EXPORT gboolean	v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE ix, gboolean state)
+LIB3270_EXPORT gboolean	v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix, gboolean state)
 {
 	g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
 
diff --git a/src/terminal/widget.c b/src/terminal/widget.c
index 339cac8..a574412 100644
--- a/src/terminal/widget.c
+++ b/src/terminal/widget.c
@@ -157,7 +157,7 @@ gboolean v3270_query_tooltip(GtkWidget  *widget, gint x, gint y, G_GNUC_UNUSED g
 	return FALSE;
 }
 
-static void v3270_toggle_changed(G_GNUC_UNUSED v3270 *widget, G_GNUC_UNUSED LIB3270_TOGGLE toggle_id, G_GNUC_UNUSED gboolean toggle_state, G_GNUC_UNUSED const gchar *toggle_name)
+static void v3270_toggle_changed(G_GNUC_UNUSED v3270 *widget, G_GNUC_UNUSED LIB3270_TOGGLE_ID toggle_id, G_GNUC_UNUSED gboolean toggle_state, G_GNUC_UNUSED const gchar *toggle_name)
 {
 }
 
diff --git a/src/trace/trace.c b/src/trace/trace.c
index 2726e92..9b2a52c 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -327,7 +327,7 @@
 	{
  		size_t ix;
 
-		static const LIB3270_TOGGLE toggles[] = {
+		static const LIB3270_TOGGLE_ID toggles[] = {
 				LIB3270_TOGGLE_DS_TRACE,
 				LIB3270_TOGGLE_NETWORK_TRACE,
 				LIB3270_TOGGLE_EVENT_TRACE,
--
libgit2 0.21.2