diff --git a/src/objects/actions/lib3270/pakey.c b/src/objects/actions/lib3270/pakey.c
index e285912..08d6de7 100644
--- a/src/objects/actions/lib3270/pakey.c
+++ b/src/objects/actions/lib3270/pakey.c
@@ -34,36 +34,25 @@
 
  #include "../private.h"
  #include <v3270.h>
+ #include <v3270/actions.h>
 
- #define PW3270_TYPE_PAKEY_ACTION				(Lib3270PaAction_get_type())
- #define PW3270_LIB3270_PAKEY_ACTION(inst)		(G_TYPE_CHECK_INSTANCE_CAST ((inst), PW3270_TYPE_PAKEY_ACTION, Lib3270PaAction))
- #define PW3270_IS_LIB3270_PAKEY_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_TYPE ((inst), PW3270_TYPE_PAKEY_ACTION))
+ #define LIB3270_TYPE_PA_ACTION		(Lib3270PaAction_get_type())
+ #define LIB3270_PA_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_CAST ((inst), LIB3270_TYPE_PA_ACTION, Lib3270PaAction))
+ #define LIB3270_IS_PA_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_TYPE ((inst), LIB3270_TYPE_PA_ACTION))
 
  typedef struct _Lib3270PaActionClass {
- 	pw3270ActionClass parent_class;
+ 	V3270ActionClass parent_class;
 
  } Lib3270PaActionClass;
 
  typedef struct _Lib3270PaAction {
- 	pw3270Action parent;
-
+ 	V3270Action parent;
  } Lib3270PaAction;
 
  static void Lib3270PaAction_class_init(Lib3270PaActionClass *klass);
  static void Lib3270PaAction_init(Lib3270PaAction *action);
 
- G_DEFINE_TYPE(Lib3270PaAction, Lib3270PaAction, PW3270_TYPE_ACTION);
-
- static gboolean get_enabled(GAction G_GNUC_UNUSED(*action), GtkWidget *terminal) {
-
-//	debug("%s(%s)",__FUNCTION__,pw3270_action_get_name(action));
-
- 	if(terminal)
-		return lib3270_is_connected(v3270_get_session(terminal)) > 0 ? TRUE: FALSE;
-
-	return FALSE;
-
- }
+ G_DEFINE_TYPE(Lib3270PaAction, Lib3270PaAction, V3270_TYPE_ACTION);
 
  static void activate(GAction *action, GVariant *parameter, GtkWidget *terminal) {
 
@@ -93,22 +82,22 @@
 
  }
 
- void Lib3270PaAction_class_init(Lib3270PaActionClass *klass) {
-
-	klass->parent_class.get_enabled = get_enabled;
-
+ void Lib3270PaAction_class_init(Lib3270PaActionClass G_GNUC_UNUSED(*klass)) {
  }
 
- void Lib3270PaAction_init(Lib3270PaAction G_GNUC_UNUSED(*object)) {
- }
+ void Lib3270PaAction_init(Lib3270PaAction *action) {
 
+	static const LIB3270_PROPERTY info = {
+		.name = "pakey",
+		.group = LIB3270_ACTION_GROUP_ONLINE
+	};
 
- GAction * pw3270_action_new_pakey(void) {
- 	pw3270Action * action = PW3270_ACTION(g_object_new(PW3270_TYPE_PAKEY_ACTION, NULL));
+	action->parent.activate = activate;
+	action->parent.info		= &info;
 
-	action->activate = activate;
-	action->name = "pakey";
+ }
 
- 	return G_ACTION(action);
+ GAction * v3270_pakey_action_new(void) {
+ 	return G_ACTION(g_object_new(LIB3270_TYPE_PA_ACTION, NULL));
  }
 
diff --git a/src/objects/actions/lib3270/pfkey.c b/src/objects/actions/lib3270/pfkey.c
index 09b8225..a609747 100644
--- a/src/objects/actions/lib3270/pfkey.c
+++ b/src/objects/actions/lib3270/pfkey.c
@@ -28,42 +28,31 @@
  */
 
  /**
-  * @brief Implement GAction "wrapper" for lib3270's PFs.
+  * @brief Implement GAction "wrapper" for lib3270's PAs.
   *
   */
 
  #include "../private.h"
  #include <v3270.h>
+ #include <v3270/actions.h>
 
- #define PW3270_TYPE_PFKEY_ACTION				(Lib3270PfAction_get_type())
- #define PW3270_LIB3270_PFKEY_ACTION(inst)		(G_TYPE_CHECK_INSTANCE_CAST ((inst), PW3270_TYPE_PFKEY_ACTION, Lib3270PfAction))
- #define PW3270_IS_LIB3270_PFKEY_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_TYPE ((inst), PW3270_TYPE_PFKEY_ACTION))
+ #define LIB3270_TYPE_PF_ACTION		(Lib3270PfAction_get_type())
+ #define LIB3270_PF_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_CAST ((inst), LIB3270_TYPE_PF_ACTION, Lib3270PfAction))
+ #define LIB3270_IS_PF_ACTION(inst)	(G_TYPE_CHECK_INSTANCE_TYPE ((inst), LIB3270_TYPE_PF_ACTION))
 
  typedef struct _Lib3270PfActionClass {
- 	pw3270ActionClass parent_class;
+ 	V3270ActionClass parent_class;
 
  } Lib3270PfActionClass;
 
  typedef struct _Lib3270PfAction {
- 	pw3270Action parent;
-
+ 	V3270Action parent;
  } Lib3270PfAction;
 
  static void Lib3270PfAction_class_init(Lib3270PfActionClass *klass);
  static void Lib3270PfAction_init(Lib3270PfAction *action);
 
- G_DEFINE_TYPE(Lib3270PfAction, Lib3270PfAction, PW3270_TYPE_ACTION);
-
- static gboolean get_enabled(GAction G_GNUC_UNUSED(*action), GtkWidget *terminal) {
-
-//	debug("%s(%s)",__FUNCTION__,pw3270_action_get_name(action));
-
- 	if(terminal)
-		return lib3270_is_connected(v3270_get_session(terminal)) > 0 ? TRUE: FALSE;
-
-	return FALSE;
-
- }
+ G_DEFINE_TYPE(Lib3270PfAction, Lib3270PfAction, V3270_TYPE_ACTION);
 
  static void activate(GAction *action, GVariant *parameter, GtkWidget *terminal) {
 
@@ -93,23 +82,22 @@
 
  }
 
- void Lib3270PfAction_class_init(Lib3270PfActionClass *klass) {
-
-	klass->parent_class.get_enabled = get_enabled;
-
- }
-
- void Lib3270PfAction_init(Lib3270PfAction G_GNUC_UNUSED(*action)) {
+ void Lib3270PfAction_class_init(Lib3270PfActionClass G_GNUC_UNUSED(*klass)) {
  }
 
- GAction * pw3270_action_new_pfkey(void) {
+ void Lib3270PfAction_init(Lib3270PfAction *action) {
 
- 	pw3270Action * action = PW3270_ACTION(g_object_new(PW3270_TYPE_PFKEY_ACTION, NULL));
+	static const LIB3270_PROPERTY info = {
+		.name = "pfkey",
+		.group = LIB3270_ACTION_GROUP_ONLINE
+	};
 
-	action->activate = activate;
-	action->name = "pfkey";
+	action->parent.activate = activate;
+	action->parent.info		= &info;
 
- 	return G_ACTION(action);
  }
 
+ GAction * v3270_pfkey_action_new(void) {
+ 	return G_ACTION(g_object_new(LIB3270_TYPE_PF_ACTION, NULL));
+ }
 
diff --git a/src/objects/actions/private.h b/src/objects/actions/private.h
index 7be6127..15eb527 100644
--- a/src/objects/actions/private.h
+++ b/src/objects/actions/private.h
@@ -51,8 +51,8 @@
 	/* not really I18N-related, but also a string marker macro */
 	#define I_(string) g_intern_static_string (string)
 
-	G_GNUC_INTERNAL GAction * pw3270_action_new_pfkey(void);
-	G_GNUC_INTERNAL GAction * pw3270_action_new_pakey(void);
+	G_GNUC_INTERNAL GAction * v3270_pfkey_action_new(void);
+	G_GNUC_INTERNAL GAction * v3270_pakey_action_new(void);
 
 	G_GNUC_INTERNAL void pw3270_action_set_name(GAction *object, const gchar *name);
 
diff --git a/src/objects/actions/window.c b/src/objects/actions/window.c
index 4aa9ec8..48e865f 100644
--- a/src/objects/actions/window.c
+++ b/src/objects/actions/window.c
@@ -84,8 +84,8 @@
 	// Map special actions
 	{
 		GAction * actions[] = {
-			pw3270_action_new_pfkey(),
-			pw3270_action_new_pakey(),
+			v3270_pfkey_action_new(),
+			v3270_pakey_action_new(),
 //			pw3270_action_connect_new(),
 //			pw3270_action_copy_new(),
 //			pw3270_action_cut_new(),
--
libgit2 0.21.2