core: rename type t_script_callback to t_plugin_script_cb

11 files changed, 403 insertions, 403 deletions

diff --git a/src/plugins/guile/weechat-guile-api.c b/src/plugins/guile/weechat-guile-api.c
index 3f5805b8f..5033e785c 100644
--- a/src/plugins/guile/weechat-guile-api.c
+++ b/src/plugins/guile/weechat-guile-api.c
@@ -751,12 +751,12 @@ int
 weechat_guile_api_config_reload_cb (void *data,
                                     struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -819,12 +819,12 @@ weechat_guile_api_config_read_cb (void *data,
                                   struct t_config_section *section,
                                   const char *option_name, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -866,12 +866,12 @@ weechat_guile_api_config_section_write_cb (void *data,
                                            struct t_config_file *config_file,
                                            const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -910,12 +910,12 @@ weechat_guile_api_config_section_write_default_cb (void *data,
                                                    struct t_config_file *config_file,
                                                    const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -956,12 +956,12 @@ weechat_guile_api_config_section_create_option_cb (void *data,
                                                    const char *option_name,
                                                    const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1005,12 +1005,12 @@ weechat_guile_api_config_section_delete_option_cb (void *data,
                                                    struct t_config_section *section,
                                                    struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1141,12 +1141,12 @@ weechat_guile_api_config_option_check_value_cb (void *data,
                                                 struct t_config_option *option,
                                                 const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1183,12 +1183,12 @@ void
 weechat_guile_api_config_option_change_cb (void *data,
                                            struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1216,12 +1216,12 @@ void
 weechat_guile_api_config_option_delete_cb (void *data,
                                            struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2086,7 +2086,7 @@ int
 weechat_guile_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                    int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2094,7 +2094,7 @@ weechat_guile_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2164,12 +2164,12 @@ int
 weechat_guile_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                        const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2230,12 +2230,12 @@ weechat_guile_api_hook_command_run (SCM command, SCM function, SCM data)
 int
 weechat_guile_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2300,12 +2300,12 @@ weechat_guile_api_hook_timer (SCM interval, SCM align_second, SCM max_calls,
 int
 weechat_guile_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2372,12 +2372,12 @@ weechat_guile_api_hook_process_cb (void *data,
                                    const char *command, int return_code,
                                    const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2478,13 +2478,13 @@ int
 weechat_guile_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                    const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2565,7 +2565,7 @@ weechat_guile_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                  int displayed, int highlight,
                                  const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -2574,7 +2574,7 @@ weechat_guile_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2656,13 +2656,13 @@ int
 weechat_guile_api_hook_signal_cb (void *data, const char *signal,
                                  const char *type_data, void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2786,12 +2786,12 @@ int
 weechat_guile_api_hook_hsignal_cb (void *data, const char *signal,
                                    struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2874,12 +2874,12 @@ weechat_guile_api_hook_hsignal_send (SCM signal, SCM hashtable)
 int
 weechat_guile_api_hook_config_cb (void *data, const char *option, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2940,12 +2940,12 @@ weechat_guile_api_hook_completion_cb (void *data, const char *completion_item,
                                       struct t_gui_buffer *buffer,
                                       struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3033,11 +3033,11 @@ char *
 weechat_guile_api_hook_modifier_cb (void *data, const char *modifier,
                                     const char *modifier_data,  const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3111,11 +3111,11 @@ const char *
 weechat_guile_api_hook_info_cb (void *data, const char *info_name,
                                 const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3169,11 +3169,11 @@ struct t_hashtable *
 weechat_guile_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                           struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3230,12 +3230,12 @@ struct t_infolist *
 weechat_guile_api_hook_infolist_cb (void *data, const char *infolist_name,
                                     void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3296,11 +3296,11 @@ weechat_guile_api_hook_infolist (SCM infolist_name, SCM description,
 struct t_hashtable *
 weechat_guile_api_hook_focus_cb (void *data, struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3381,12 +3381,12 @@ int
 weechat_guile_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                         const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3422,12 +3422,12 @@ weechat_guile_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
 int
 weechat_guile_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4186,11 +4186,11 @@ char *
 weechat_guile_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                      struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5216,12 +5216,12 @@ weechat_guile_api_upgrade_read_cb (void *data,
                                    int object_id,
                                    struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
diff --git a/src/plugins/lua/weechat-lua-api.c b/src/plugins/lua/weechat-lua-api.c
index 3e7eb89a7..70aeb8fe9 100644
--- a/src/plugins/lua/weechat-lua-api.c
+++ b/src/plugins/lua/weechat-lua-api.c
@@ -862,12 +862,12 @@ int
 weechat_lua_api_config_reload_cb (void *data,
                                   struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -933,12 +933,12 @@ weechat_lua_api_config_read_cb (void *data,
                                 struct t_config_section *section,
                                 const char *option_name, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -980,12 +980,12 @@ weechat_lua_api_config_section_write_cb (void *data,
                                          struct t_config_file *config_file,
                                          const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1024,12 +1024,12 @@ weechat_lua_api_config_section_write_default_cb (void *data,
                                                  struct t_config_file *config_file,
                                                  const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1069,12 +1069,12 @@ weechat_lua_api_config_section_create_option_cb (void *data,
                                                  const char *option_name,
                                                  const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1117,12 +1117,12 @@ weechat_lua_api_config_section_delete_option_cb (void *data,
                                                  struct t_config_section *section,
                                                  struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1248,12 +1248,12 @@ weechat_lua_api_config_option_check_value_cb (void *data,
                                               struct t_config_option *option,
                                               const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1290,12 +1290,12 @@ void
 weechat_lua_api_config_option_change_cb (void *data,
                                          struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1323,12 +1323,12 @@ void
 weechat_lua_api_config_option_delete_cb (void *data,
                                          struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2315,7 +2315,7 @@ int
 weechat_lua_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                  int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2323,7 +2323,7 @@ weechat_lua_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2397,12 +2397,12 @@ int
 weechat_lua_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                      const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2466,12 +2466,12 @@ weechat_lua_api_hook_command_run (lua_State *L)
 int
 weechat_lua_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2540,12 +2540,12 @@ weechat_lua_api_hook_timer (lua_State *L)
 int
 weechat_lua_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2617,12 +2617,12 @@ weechat_lua_api_hook_process_cb (void *data,
                                  const char *command, int return_code,
                                  const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2729,13 +2729,13 @@ int
 weechat_lua_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                  const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2821,7 +2821,7 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                int displayed, int highlight,
                                const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -2830,7 +2830,7 @@ weechat_lua_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2917,13 +2917,13 @@ int
 weechat_lua_api_hook_signal_cb (void *data, const char *signal,
                                 const char *type_data, void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3047,12 +3047,12 @@ int
 weechat_lua_api_hook_hsignal_cb (void *data, const char *signal,
                                  struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3141,12 +3141,12 @@ int
 weechat_lua_api_hook_config_cb (void *data, const char *option,
                                 const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3210,12 +3210,12 @@ weechat_lua_api_hook_completion_cb (void *data, const char *completion_item,
                                     struct t_gui_buffer *buffer,
                                     struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3313,11 +3313,11 @@ weechat_lua_api_hook_modifier_cb (void *data, const char *modifier,
                                   const char *modifier_data,
                                   const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3394,11 +3394,11 @@ const char *
 weechat_lua_api_hook_info_cb (void *data, const char *info_name,
                               const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3455,11 +3455,11 @@ struct t_hashtable *
 weechat_lua_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                         struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3519,12 +3519,12 @@ struct t_infolist *
 weechat_lua_api_hook_infolist_cb (void *data, const char *info_name,
                                   void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3590,11 +3590,11 @@ struct t_hashtable *
 weechat_lua_api_hook_focus_cb (void *data,
                                struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3682,12 +3682,12 @@ int
 weechat_lua_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                       const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3723,12 +3723,12 @@ weechat_lua_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
 int
 weechat_lua_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4600,11 +4600,11 @@ char *
 weechat_lua_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                    struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5755,12 +5755,12 @@ weechat_lua_api_upgrade_read_cb (void *data,
                                  int object_id,
                                  struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
diff --git a/src/plugins/perl/weechat-perl-api.c b/src/plugins/perl/weechat-perl-api.c
index d03586822..cb79f3fbf 100644
--- a/src/plugins/perl/weechat-perl-api.c
+++ b/src/plugins/perl/weechat-perl-api.c
@@ -804,12 +804,12 @@ int
 weechat_perl_api_config_reload_cb (void *data,
                                    struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -875,12 +875,12 @@ weechat_perl_api_config_section_read_cb (void *data,
                                          const char *option_name,
                                          const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -922,12 +922,12 @@ weechat_perl_api_config_section_write_cb (void *data,
                                           struct t_config_file *config_file,
                                           const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -966,12 +966,12 @@ weechat_perl_api_config_section_write_default_cb (void *data,
                                                   struct t_config_file *config_file,
                                                   const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1011,12 +1011,12 @@ weechat_perl_api_config_section_create_option_cb (void *data,
                                                   const char *option_name,
                                                   const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1059,12 +1059,12 @@ weechat_perl_api_config_section_delete_option_cb (void *data,
                                                   struct t_config_section *section,
                                                   struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1185,12 +1185,12 @@ weechat_perl_api_config_option_check_value_cb (void *data,
                                                struct t_config_option *option,
                                                const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1227,12 +1227,12 @@ void
 weechat_perl_api_config_option_change_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1260,12 +1260,12 @@ void
 weechat_perl_api_config_option_delete_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2175,7 +2175,7 @@ int
 weechat_perl_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                   int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2183,7 +2183,7 @@ weechat_perl_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2256,12 +2256,12 @@ int
 weechat_perl_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                       const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2324,12 +2324,12 @@ XS (XS_weechat_api_hook_command_run)
 int
 weechat_perl_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2390,12 +2390,12 @@ XS (XS_weechat_api_hook_timer)
 int
 weechat_perl_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2458,12 +2458,12 @@ weechat_perl_api_hook_process_cb (void *data,
                                   const char *command, int return_code,
                                   const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2563,13 +2563,13 @@ int
 weechat_perl_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                   const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2650,7 +2650,7 @@ weechat_perl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                 int displayed, int highlight,
                                 const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -2659,7 +2659,7 @@ weechat_perl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2743,13 +2743,13 @@ int
 weechat_perl_api_hook_signal_cb (void *data, const char *signal, const char *type_data,
                                  void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2872,12 +2872,12 @@ int
 weechat_perl_api_hook_hsignal_cb (void *data, const char *signal,
                                   struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2964,12 +2964,12 @@ XS (XS_weechat_api_hook_hsignal_send)
 int
 weechat_perl_api_hook_config_cb (void *data, const char *option, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3032,12 +3032,12 @@ weechat_perl_api_hook_completion_cb (void *data, const char *completion_item,
                                      struct t_gui_buffer *buffer,
                                      struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3131,11 +3131,11 @@ char *
 weechat_perl_api_hook_modifier_cb (void *data, const char *modifier,
                                    const char *modifier_data, const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3210,11 +3210,11 @@ const char *
 weechat_perl_api_hook_info_cb (void *data, const char *info_name,
                                const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3270,11 +3270,11 @@ struct t_hashtable *
 weechat_perl_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                          struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3333,12 +3333,12 @@ struct t_infolist *
 weechat_perl_api_hook_infolist_cb (void *data, const char *infolist_name,
                                    void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3403,11 +3403,11 @@ struct t_hashtable *
 weechat_perl_api_hook_focus_cb (void *data,
                                 struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3496,12 +3496,12 @@ int
 weechat_perl_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                        const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3536,12 +3536,12 @@ weechat_perl_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
 int
 weechat_perl_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4381,11 +4381,11 @@ char *
 weechat_perl_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                     struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5486,12 +5486,12 @@ weechat_perl_api_upgrade_read_cb (void *data,
                                   int object_id,
                                   struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
diff --git a/src/plugins/plugin-script-api.c b/src/plugins/plugin-script-api.c
index 0f7794857..8cc9555c4 100644
--- a/src/plugins/plugin-script-api.c
+++ b/src/plugins/plugin-script-api.c
@@ -60,7 +60,7 @@ plugin_script_api_config_new (struct t_weechat_plugin *weechat_plugin,
                               const char *function,
                               const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_config_file *new_config_file;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -121,9 +121,9 @@ plugin_script_api_config_new_section (struct t_weechat_plugin *weechat_plugin,
                                       const char *function_delete_option,
                                       const char *data_delete_option)
 {
-    struct t_script_callback *script_cb_read, *script_cb_write;
-    struct t_script_callback *script_cb_write_default, *script_cb_create_option;
-    struct t_script_callback *script_cb_delete_option;
+    struct t_plugin_script_cb *script_cb_read, *script_cb_write;
+    struct t_plugin_script_cb *script_cb_write_default, *script_cb_create_option;
+    struct t_plugin_script_cb *script_cb_delete_option;
     struct t_config_section *new_section;
 
     script_cb_read = plugin_script_callback_add (script, function_read, data_read);
@@ -216,8 +216,8 @@ plugin_script_api_config_new_option (struct t_weechat_plugin *weechat_plugin,
                                      const char *function_delete,
                                      const char *data_delete)
 {
-    struct t_script_callback *script_cb_check_value, *script_cb_change;
-    struct t_script_callback *script_cb_delete;
+    struct t_plugin_script_cb *script_cb_check_value, *script_cb_change;
+    struct t_plugin_script_cb *script_cb_delete;
     struct t_config_option *new_option;
 
     script_cb_check_value = plugin_script_callback_add (script, function_check_value, data_check_value);
@@ -275,7 +275,7 @@ plugin_script_api_config_option_free (struct t_weechat_plugin *weechat_plugin,
                                       struct t_plugin_script *script,
                                       struct t_config_option *option)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !option)
         return;
@@ -304,7 +304,7 @@ plugin_script_api_config_section_free_options (struct t_weechat_plugin *weechat_
                                                struct t_plugin_script *script,
                                                struct t_config_section *section)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !section)
         return;
@@ -333,7 +333,7 @@ plugin_script_api_config_section_free (struct t_weechat_plugin *weechat_plugin,
                                        struct t_plugin_script *script,
                                        struct t_config_section *section)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !section)
         return;
@@ -361,7 +361,7 @@ plugin_script_api_config_free (struct t_weechat_plugin *weechat_plugin,
                                struct t_plugin_script *script,
                                struct t_config_file *config_file)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !config_file)
         return;
@@ -499,7 +499,7 @@ plugin_script_api_hook_command (struct t_weechat_plugin *weechat_plugin,
                                 const char *function,
                                 const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -535,7 +535,7 @@ plugin_script_api_hook_command_run (struct t_weechat_plugin *weechat_plugin,
                                     const char *function,
                                     const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -569,7 +569,7 @@ plugin_script_api_hook_timer (struct t_weechat_plugin *weechat_plugin,
                               const char *function,
                               const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -603,7 +603,7 @@ plugin_script_api_hook_fd (struct t_weechat_plugin *weechat_plugin,
                            const char *function,
                            const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -642,7 +642,7 @@ plugin_script_api_hook_process_hashtable (struct t_weechat_plugin *weechat_plugi
                                           const char *function,
                                           const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -705,7 +705,7 @@ plugin_script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,
                                 const char *function,
                                 const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -748,7 +748,7 @@ plugin_script_api_hook_print (struct t_weechat_plugin *weechat_plugin,
                               const char *function,
                               const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -783,7 +783,7 @@ plugin_script_api_hook_signal (struct t_weechat_plugin *weechat_plugin,
                                const char *function,
                                const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -816,7 +816,7 @@ plugin_script_api_hook_hsignal (struct t_weechat_plugin *weechat_plugin,
                                 const char *function,
                                 const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -849,7 +849,7 @@ plugin_script_api_hook_config (struct t_weechat_plugin *weechat_plugin,
                                const char *function,
                                const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -885,7 +885,7 @@ plugin_script_api_hook_completion (struct t_weechat_plugin *weechat_plugin,
                                    const char *function,
                                    const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -920,7 +920,7 @@ plugin_script_api_hook_modifier (struct t_weechat_plugin *weechat_plugin,
                                  const char *function,
                                  const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -956,7 +956,7 @@ plugin_script_api_hook_info (struct t_weechat_plugin *weechat_plugin,
                              const char *function,
                              const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -994,7 +994,7 @@ plugin_script_api_hook_info_hashtable (struct t_weechat_plugin *weechat_plugin,
                                        const char *function,
                                        const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -1035,7 +1035,7 @@ plugin_script_api_hook_infolist (struct t_weechat_plugin *weechat_plugin,
                                  const char *function,
                                  const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -1070,7 +1070,7 @@ plugin_script_api_hook_focus (struct t_weechat_plugin *weechat_plugin,
                               const char *function,
                               const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_hook *new_hook;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -1098,7 +1098,7 @@ plugin_script_api_unhook (struct t_weechat_plugin *weechat_plugin,
                           struct t_plugin_script *script,
                           struct t_hook *hook)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !hook)
         return;
@@ -1125,7 +1125,7 @@ void
 plugin_script_api_unhook_all (struct t_weechat_plugin *weechat_plugin,
                               struct t_plugin_script *script)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     ptr_script_cb = script->callbacks;
     while (ptr_script_cb)
@@ -1160,8 +1160,8 @@ plugin_script_api_buffer_new (struct t_weechat_plugin *weechat_plugin,
                               const char *function_close,
                               const char *data_close)
 {
-    struct t_script_callback *script_cb_input;
-    struct t_script_callback *script_cb_close;
+    struct t_plugin_script_cb *script_cb_input;
+    struct t_plugin_script_cb *script_cb_close;
     struct t_gui_buffer *new_buffer;
 
     script_cb_input = plugin_script_callback_add (script, function_input, data_input);
@@ -1210,7 +1210,7 @@ plugin_script_api_buffer_close (struct t_weechat_plugin *weechat_plugin,
                                 struct t_plugin_script *script,
                                 struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !buffer)
         return;
@@ -1243,7 +1243,7 @@ plugin_script_api_bar_item_new (struct t_weechat_plugin *weechat_plugin,
                                 const char *function,
                                 const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     struct t_gui_bar_item *new_item;
 
     script_cb = plugin_script_callback_add (script, function, data);
@@ -1270,7 +1270,7 @@ plugin_script_api_bar_item_remove (struct t_weechat_plugin *weechat_plugin,
                                    struct t_plugin_script *script,
                                    struct t_gui_bar_item *item)
 {
-    struct t_script_callback *ptr_script_cb, *next_callback;
+    struct t_plugin_script_cb *ptr_script_cb, *next_callback;
 
     if (!weechat_plugin || !script || !item)
         return;
@@ -1461,7 +1461,7 @@ plugin_script_api_upgrade_read (struct t_weechat_plugin *weechat_plugin,
                                 const char *function,
                                 const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     int rc;
 
     if (!function || !function[0])
diff --git a/src/plugins/plugin-script-callback.c b/src/plugins/plugin-script-callback.c
index 673114174..d32296299 100644
--- a/src/plugins/plugin-script-callback.c
+++ b/src/plugins/plugin-script-callback.c
@@ -34,10 +34,10 @@
  * plugin_script_callback_alloc: allocate a new callback and initializes it
  */
 
-struct t_script_callback *
+struct t_plugin_script_cb *
 plugin_script_callback_alloc ()
 {
-    struct t_script_callback *new_script_callback;
+    struct t_plugin_script_cb *new_script_callback;
 
     new_script_callback = malloc (sizeof (*new_script_callback));
     if (new_script_callback)
@@ -64,12 +64,12 @@ plugin_script_callback_alloc ()
  *                             return pointer to new callback or NULL if error
  */
 
-struct t_script_callback *
+struct t_plugin_script_cb *
 plugin_script_callback_add (struct t_plugin_script *script,
                             const char *function,
                             const char *data)
 {
-    struct t_script_callback *script_cb;
+    struct t_plugin_script_cb *script_cb;
     if (!script)
         return NULL;
 
@@ -97,7 +97,7 @@ plugin_script_callback_add (struct t_plugin_script *script,
  */
 
 void
-plugin_script_callback_free_data (struct t_script_callback *script_callback)
+plugin_script_callback_free_data (struct t_plugin_script_cb *script_callback)
 {
     if (script_callback->function)
         free (script_callback->function);
@@ -111,7 +111,7 @@ plugin_script_callback_free_data (struct t_script_callback *script_callback)
 
 void
 plugin_script_callback_remove (struct t_plugin_script *script,
-                               struct t_script_callback *script_callback)
+                               struct t_plugin_script_cb *script_callback)
 {
     /* remove callback from list */
     if (script_callback->prev_callback)
@@ -147,7 +147,7 @@ plugin_script_callback_remove_all (struct t_plugin_script *script)
 
 void
 plugin_script_callback_print_log (struct t_weechat_plugin *weechat_plugin,
-                                  struct t_script_callback *script_callback)
+                                  struct t_plugin_script_cb *script_callback)
 {
     weechat_log_printf ("");
     weechat_log_printf ("  [callback (addr:0x%lx)]",       script_callback);
diff --git a/src/plugins/plugin-script-callback.h b/src/plugins/plugin-script-callback.h
index 5ffdea846..953c83105 100644
--- a/src/plugins/plugin-script-callback.h
+++ b/src/plugins/plugin-script-callback.h
@@ -20,7 +20,7 @@
 #ifndef __WEECHAT_PLUGIN_SCRIPT_CALLBACK_H
 #define __WEECHAT_PLUGIN_SCRIPT_CALLBACK_H 1
 
-struct t_script_callback
+struct t_plugin_script_cb
 {
     void *script;                            /* pointer to script           */
     char *function;                          /* script function called      */
@@ -32,17 +32,17 @@ struct t_script_callback
     struct t_gui_buffer *buffer;             /* not NULL for buffer         */
     struct t_gui_bar_item *bar_item;         /* not NULL for bar item       */
     struct t_upgrade_file *upgrade_file;     /* not NULL for upgrade file   */
-    struct t_script_callback *prev_callback; /* link to next callback       */
-    struct t_script_callback *next_callback; /* link to previous callback   */
+    struct t_plugin_script_cb *prev_callback; /* link to next callback      */
+    struct t_plugin_script_cb *next_callback; /* link to previous callback  */
 };
 
-extern struct t_script_callback *plugin_script_callback_add (struct t_plugin_script *script,
-                                                             const char *function,
-                                                             const char *data);
+extern struct t_plugin_script_cb *plugin_script_callback_add (struct t_plugin_script *script,
+                                                              const char *function,
+                                                              const char *data);
 extern void plugin_script_callback_remove (struct t_plugin_script *script,
-                                           struct t_script_callback *script_callback);
+                                           struct t_plugin_script_cb *script_callback);
 extern void plugin_script_callback_remove_all (struct t_plugin_script *script);
 extern void plugin_script_callback_print_log (struct t_weechat_plugin *weechat_plugin,
-                                              struct t_script_callback *script_callback);
+                                              struct t_plugin_script_cb *script_callback);
 
 #endif /* __WEECHAT_PLUGIN_SCRIPT_CALLBACK_H */
diff --git a/src/plugins/plugin-script.c b/src/plugins/plugin-script.c
index 44f5208e4..22a128e07 100644
--- a/src/plugins/plugin-script.c
+++ b/src/plugins/plugin-script.c
@@ -604,8 +604,8 @@ plugin_script_set_buffer_callbacks (struct t_weechat_plugin *weechat_plugin,
     const char *script_name, *str_script_input_cb, *str_script_input_cb_data;
     const char *str_script_close_cb, *str_script_close_cb_data;
     struct t_plugin_script *ptr_script;
-    struct t_script_callback *script_cb_input;
-    struct t_script_callback *script_cb_close;
+    struct t_plugin_script_cb *script_cb_input;
+    struct t_plugin_script_cb *script_cb_close;
 
     infolist = weechat_infolist_get ("buffer", NULL, NULL);
     if (infolist)
@@ -681,7 +681,7 @@ plugin_script_remove_buffer_callbacks (struct t_plugin_script *scripts,
                                        struct t_gui_buffer *buffer)
 {
     struct t_plugin_script *ptr_script;
-    struct t_script_callback *ptr_script_cb, *next_script_cb;
+    struct t_plugin_script_cb *ptr_script_cb, *next_script_cb;
 
     for (ptr_script = scripts; ptr_script;
          ptr_script = ptr_script->next_script)
@@ -716,7 +716,7 @@ plugin_script_remove (struct t_weechat_plugin *weechat_plugin,
                       struct t_plugin_script **last_script,
                       struct t_plugin_script *script)
 {
-    struct t_script_callback *ptr_script_cb, *ptr_script_cb2;
+    struct t_plugin_script_cb *ptr_script_cb, *ptr_script_cb2;
 
     script->unloading = 1;
 
@@ -1314,7 +1314,7 @@ plugin_script_print_log (struct t_weechat_plugin *weechat_plugin,
                          struct t_plugin_script *scripts)
 {
     struct t_plugin_script *ptr_script;
-    struct t_script_callback *ptr_script_cb;
+    struct t_plugin_script_cb *ptr_script_cb;
 
     weechat_log_printf ("");
     weechat_log_printf ("***** \"%s\" plugin dump *****",
diff --git a/src/plugins/plugin-script.h b/src/plugins/plugin-script.h
index 923a964ba..593c4265d 100644
--- a/src/plugins/plugin-script.h
+++ b/src/plugins/plugin-script.h
@@ -61,7 +61,7 @@ struct t_plugin_script
     char *description;                   /* plugin description              */
     char *shutdown_func;                 /* function when script is unloaded*/
     char *charset;                       /* script charset                  */
-    struct t_script_callback *callbacks; /* callbacks for script            */
+    struct t_plugin_script_cb *callbacks; /* callbacks for script           */
     int unloading;                       /* script is being unloaded        */
     struct t_plugin_script *prev_script; /* link to previous script         */
     struct t_plugin_script *next_script; /* link to next script             */
diff --git a/src/plugins/python/weechat-python-api.c b/src/plugins/python/weechat-python-api.c
index a90749d97..ddb6ef9ca 100644
--- a/src/plugins/python/weechat-python-api.c
+++ b/src/plugins/python/weechat-python-api.c
@@ -832,12 +832,12 @@ int
 weechat_python_api_config_reload_cb (void *data,
                                      struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -902,12 +902,12 @@ weechat_python_api_config_read_cb (void *data,
                                    struct t_config_section *section,
                                    const char *option_name, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -949,12 +949,12 @@ weechat_python_api_config_section_write_cb (void *data,
                                             struct t_config_file *config_file,
                                             const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -993,12 +993,12 @@ weechat_python_api_config_section_write_default_cb (void *data,
                                                     struct t_config_file *config_file,
                                                     const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1038,12 +1038,12 @@ weechat_python_api_config_section_create_option_cb (void *data,
                                                     const char *option_name,
                                                     const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1086,12 +1086,12 @@ weechat_python_api_config_section_delete_option_cb (void *data,
                                                     struct t_config_section *section,
                                                     struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1220,12 +1220,12 @@ weechat_python_api_config_option_check_value_cb (void *data,
                                                  struct t_config_option *option,
                                                  const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1262,12 +1262,12 @@ void
 weechat_python_api_config_option_change_cb (void *data,
                                             struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1295,12 +1295,12 @@ void
 weechat_python_api_config_option_delete_cb (void *data,
                                             struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2257,7 +2257,7 @@ int
 weechat_python_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                     int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2265,7 +2265,7 @@ weechat_python_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2339,12 +2339,12 @@ int
 weechat_python_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                         const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2407,12 +2407,12 @@ weechat_python_api_hook_command_run (PyObject *self, PyObject *args)
 int
 weechat_python_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2481,12 +2481,12 @@ weechat_python_api_hook_timer (PyObject *self, PyObject *args)
 int
 weechat_python_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2558,12 +2558,12 @@ weechat_python_api_hook_process_cb (void *data,
                                     const char *command, int return_code,
                                     const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2674,12 +2674,12 @@ int
 weechat_python_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                     const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2765,7 +2765,7 @@ weechat_python_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                   int displayed, int highlight,
                                   const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -2774,7 +2774,7 @@ weechat_python_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2861,13 +2861,13 @@ int
 weechat_python_api_hook_signal_cb (void *data, const char *signal, const char *type_data,
                                    void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2990,12 +2990,12 @@ int
 weechat_python_api_hook_hsignal_cb (void *data, const char *signal,
                                     struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3087,12 +3087,12 @@ weechat_python_api_hook_hsignal_send (PyObject *self, PyObject *args)
 int
 weechat_python_api_hook_config_cb (void *data, const char *option, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3155,12 +3155,12 @@ weechat_python_api_hook_completion_cb (void *data, const char *completion_item,
                                        struct t_gui_buffer *buffer,
                                        struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3257,11 +3257,11 @@ char *
 weechat_python_api_hook_modifier_cb (void *data, const char *modifier,
                                      const char *modifier_data, const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3336,11 +3336,11 @@ const char *
 weechat_python_api_hook_info_cb (void *data, const char *info_name,
                                  const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3397,12 +3397,12 @@ struct t_hashtable *
 weechat_python_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                            struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     struct t_hashtable *ret_hashtable;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3470,12 +3470,12 @@ struct t_infolist *
 weechat_python_api_hook_infolist_cb (void *data, const char *infolist_name,
                                      void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3542,12 +3542,12 @@ struct t_hashtable *
 weechat_python_api_hook_focus_cb (void *data,
                                   struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     struct t_hashtable *ret_hashtable;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3642,12 +3642,12 @@ int
 weechat_python_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                          const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3682,12 +3682,12 @@ weechat_python_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer
 int
 weechat_python_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4543,11 +4543,11 @@ char *
 weechat_python_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                       struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5670,12 +5670,12 @@ weechat_python_api_upgrade_read_cb (void *data,
                                     int object_id,
                                     struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c
index f2ea2bba8..17eb4f79e 100644
--- a/src/plugins/ruby/weechat-ruby-api.c
+++ b/src/plugins/ruby/weechat-ruby-api.c
@@ -952,12 +952,12 @@ int
 weechat_ruby_api_config_reload_cb (void *data,
                                    struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1028,12 +1028,12 @@ weechat_ruby_api_config_read_cb (void *data,
                                  struct t_config_section *section,
                                  const char *option_name, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1075,12 +1075,12 @@ weechat_ruby_api_config_section_write_cb (void *data,
                                           struct t_config_file *config_file,
                                           const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1119,12 +1119,12 @@ weechat_ruby_api_config_section_write_default_cb (void *data,
                                                   struct t_config_file *config_file,
                                                   const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1164,12 +1164,12 @@ weechat_ruby_api_config_section_create_option_cb (void *data,
                                                   const char *option_name,
                                                   const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1212,12 +1212,12 @@ weechat_ruby_api_config_section_delete_option_cb (void *data,
                                                   struct t_config_section *section,
                                                   struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1379,12 +1379,12 @@ weechat_ruby_api_config_option_check_value_cb (void *data,
                                                struct t_config_option *option,
                                                const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1421,12 +1421,12 @@ void
 weechat_ruby_api_config_option_change_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1454,12 +1454,12 @@ void
 weechat_ruby_api_config_option_delete_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2595,7 +2595,7 @@ int
 weechat_ruby_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                   int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2603,7 +2603,7 @@ weechat_ruby_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2689,12 +2689,12 @@ int
 weechat_ruby_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                       const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2763,12 +2763,12 @@ weechat_ruby_api_hook_command_run (VALUE class, VALUE command, VALUE function,
 int
 weechat_ruby_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2845,12 +2845,12 @@ weechat_ruby_api_hook_timer (VALUE class, VALUE interval, VALUE align_second,
 int
 weechat_ruby_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2931,12 +2931,12 @@ weechat_ruby_api_hook_process_cb (void *data,
                                   const char *command, int return_code,
                                   const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3058,13 +3058,13 @@ int
 weechat_ruby_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                   const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3164,7 +3164,7 @@ weechat_ruby_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                 int displayed, int highlight,
                                 const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -3173,7 +3173,7 @@ weechat_ruby_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3270,13 +3270,13 @@ int
 weechat_ruby_api_hook_signal_cb (void *data, const char *signal, const char *type_data,
                                  void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3410,12 +3410,12 @@ int
 weechat_ruby_api_hook_hsignal_cb (void *data, const char *signal,
                                   struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3511,12 +3511,12 @@ weechat_ruby_api_hook_hsignal_send (VALUE class, VALUE signal, VALUE hashtable)
 int
 weechat_ruby_api_hook_config_cb (void *data, const char *option, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3585,12 +3585,12 @@ weechat_ruby_api_hook_completion_cb (void *data, const char *completion_item,
                                      struct t_gui_buffer *buffer,
                                      struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3703,11 +3703,11 @@ char *
 weechat_ruby_api_hook_modifier_cb (void *data, const char *modifier,
                                    const char *modifier_data,  const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3794,11 +3794,11 @@ const char *
 weechat_ruby_api_hook_info_cb (void *data, const char *info_name,
                                const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3864,11 +3864,11 @@ struct t_hashtable *
 weechat_ruby_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                          struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3941,12 +3941,12 @@ struct t_infolist *
 weechat_ruby_api_hook_infolist_cb (void *data, const char *infolist_name,
                                    void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4023,11 +4023,11 @@ weechat_ruby_api_hook_infolist (VALUE class, VALUE infolist_name,
 struct t_hashtable *
 weechat_ruby_api_hook_focus_cb (void *data, struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4122,12 +4122,12 @@ int
 weechat_ruby_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                        const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4163,12 +4163,12 @@ weechat_ruby_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
 int
 weechat_ruby_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5187,11 +5187,11 @@ char *
 weechat_ruby_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                     struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -6534,12 +6534,12 @@ weechat_ruby_api_upgrade_read_cb (void *data,
                                   int object_id,
                                   struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
diff --git a/src/plugins/tcl/weechat-tcl-api.c b/src/plugins/tcl/weechat-tcl-api.c
index 2fee99c14..6b05eb87d 100644
--- a/src/plugins/tcl/weechat-tcl-api.c
+++ b/src/plugins/tcl/weechat-tcl-api.c
@@ -1046,12 +1046,12 @@ int
 weechat_tcl_api_config_reload_cb (void *data,
                                   struct t_config_file *config_file)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
 
     if (script_callback && script_callback->function && script_callback->function[0])
@@ -1121,12 +1121,12 @@ weechat_tcl_api_config_section_read_cb (void *data,
                                         struct t_config_section *section,
                                         const char *option_name, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1168,12 +1168,12 @@ weechat_tcl_api_config_section_write_cb (void *data,
                                           struct t_config_file *config_file,
                                           const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1212,12 +1212,12 @@ weechat_tcl_api_config_section_write_default_cb (void *data,
                                                   struct t_config_file *config_file,
                                                   const char *section_name)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1258,12 +1258,12 @@ weechat_tcl_api_config_section_create_option_cb (void *data,
                                                   const char *option_name,
                                                   const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1307,12 +1307,12 @@ weechat_tcl_api_config_section_delete_option_cb (void *data,
                                                  struct t_config_section *section,
                                                  struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1447,12 +1447,12 @@ weechat_tcl_api_config_option_check_value_cb (void *data,
                                                struct t_config_option *option,
                                                const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1489,12 +1489,12 @@ void
 weechat_tcl_api_config_option_change_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -1522,12 +1522,12 @@ void
 weechat_tcl_api_config_option_delete_cb (void *data,
                                           struct t_config_option *option)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2573,7 +2573,7 @@ int
 weechat_tcl_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
                                  int argc, char **argv, char **argv_eol)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
@@ -2581,7 +2581,7 @@ weechat_tcl_api_hook_command_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) argv;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2657,12 +2657,12 @@ int
 weechat_tcl_api_hook_command_run_cb (void *data, struct t_gui_buffer *buffer,
                                      const char *command)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2728,12 +2728,12 @@ weechat_tcl_api_hook_command_run (ClientData clientData, Tcl_Interp *interp,
 int
 weechat_tcl_api_hook_timer_cb (void *data, int remaining_calls)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_remaining_calls[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2803,12 +2803,12 @@ weechat_tcl_api_hook_timer (ClientData clientData, Tcl_Interp *interp,
 int
 weechat_tcl_api_hook_fd_cb (void *data, int fd)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char str_fd[32], empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2880,12 +2880,12 @@ weechat_tcl_api_hook_process_cb (void *data,
                                  const char *command, int return_code,
                                  const char *out, const char *err)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -2999,13 +2999,13 @@ int
 weechat_tcl_api_hook_connect_cb (void *data, int status, int gnutls_rc,
                                  const char *error, const char *ip_address)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[5];
     char str_status[32], str_gnutls_rc[32];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3094,7 +3094,7 @@ weechat_tcl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
                                int displayed, int highlight,
                                const char *prefix, const char *message)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[8];
     char empty_arg[1] = { '\0' };
     static char timebuffer[64];
@@ -3103,7 +3103,7 @@ weechat_tcl_api_hook_print_cb (void *data, struct t_gui_buffer *buffer,
     /* make C compiler happy */
     (void) tags_count;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3193,13 +3193,13 @@ int
 weechat_tcl_api_hook_signal_cb (void *data, const char *signal, const char *type_data,
                                  void *signal_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     static char value_str[64];
     int *rc, ret, free_needed;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3331,12 +3331,12 @@ int
 weechat_tcl_api_hook_hsignal_cb (void *data, const char *signal,
                                  struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3429,12 +3429,12 @@ weechat_tcl_api_hook_hsignal_send (ClientData clientData, Tcl_Interp *interp,
 int
 weechat_tcl_api_hook_config_cb (void *data, const char *option, const char *value)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3500,12 +3500,12 @@ weechat_tcl_api_hook_completion_cb (void *data, const char *completion_item,
                                      struct t_gui_buffer *buffer,
                                      struct t_gui_completion *completion)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3608,11 +3608,11 @@ char *
 weechat_tcl_api_hook_modifier_cb (void *data, const char *modifier,
                                    const char *modifier_data, const char *string)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3693,11 +3693,11 @@ const char *
 weechat_tcl_api_hook_info_cb (void *data, const char *info_name,
                                const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3756,11 +3756,11 @@ struct t_hashtable *
 weechat_tcl_api_hook_info_hashtable_cb (void *data, const char *info_name,
                                         struct t_hashtable *hashtable)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3822,12 +3822,12 @@ struct t_infolist *
 weechat_tcl_api_hook_infolist_cb (void *data, const char *infolist_name,
                                    void *pointer, const char *arguments)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' };
     struct t_infolist *result;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3895,11 +3895,11 @@ struct t_hashtable *
 weechat_tcl_api_hook_focus_cb (void *data,
                                struct t_hashtable *info)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -3997,12 +3997,12 @@ int
 weechat_tcl_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
                                        const char *input_data)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -4037,12 +4037,12 @@ weechat_tcl_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
 int
 weechat_tcl_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[2];
     char empty_arg[1] = { '\0' };
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -5011,11 +5011,11 @@ char *
 weechat_tcl_api_bar_item_build_cb (void *data, struct t_gui_bar_item *item,
                                    struct t_gui_window *window)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[3];
     char empty_arg[1] = { '\0' }, *ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {
@@ -6247,12 +6247,12 @@ weechat_tcl_api_upgrade_read_cb (void *data,
                                  int object_id,
                                  struct t_infolist *infolist)
 {
-    struct t_script_callback *script_callback;
+    struct t_plugin_script_cb *script_callback;
     void *func_argv[4];
     char empty_arg[1] = { '\0' }, str_object_id[32];
     int *rc, ret;
 
-    script_callback = (struct t_script_callback *)data;
+    script_callback = (struct t_plugin_script_cb *)data;
 
     if (script_callback && script_callback->function && script_callback->function[0])
     {