137 files changed, 671 insertions, 671 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 49438bce1..e6e1aadfb 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -21,58 +21,58 @@
 
 set(LIB_CORE_SRC
   weechat.c weechat.h
-  wee-arraylist.c wee-arraylist.h
-  wee-backtrace.c wee-backtrace.h
-  wee-calc.c wee-calc.h
-  wee-command.c wee-command.h
-  wee-completion.c wee-completion.h
-  wee-config.c wee-config.h
-  wee-config-file.c wee-config-file.h
-  wee-crypto.c wee-crypto.h
-  wee-debug.c wee-debug.h
-  wee-dir.c wee-dir.h
-  wee-doc.c wee-doc.h
-  wee-eval.c wee-eval.h
-  wee-hashtable.c wee-hashtable.h
-  wee-hdata.c wee-hdata.h
-  wee-hook.c wee-hook.h
-  wee-infolist.c wee-infolist.h
-  wee-input.c wee-input.h
-  wee-list.c wee-list.h
-  wee-log.c wee-log.h
-  wee-network.c wee-network.h
-  wee-proxy.c wee-proxy.h
-  wee-secure.c wee-secure.h
-  wee-secure-buffer.c wee-secure-buffer.h
-  wee-secure-config.c wee-secure-config.h
-  wee-signal.c wee-signal.h
-  wee-string.c wee-string.h
-  wee-sys.c wee-sys.h
-  wee-upgrade.c wee-upgrade.h
-  wee-upgrade-file.c wee-upgrade-file.h
-  wee-url.c wee-url.h
-  wee-utf8.c wee-utf8.h
-  wee-util.c wee-util.h
-  wee-version.c wee-version.h
-  hook/wee-hook-command-run.c hook/wee-hook-command-run.h
-  hook/wee-hook-command.c hook/wee-hook-command.h
-  hook/wee-hook-completion.c hook/wee-hook-completion.h
-  hook/wee-hook-config.c hook/wee-hook-config.h
-  hook/wee-hook-connect.c hook/wee-hook-connect.h
-  hook/wee-hook-fd.c hook/wee-hook-fd.h
-  hook/wee-hook-focus.c hook/wee-hook-focus.h
-  hook/wee-hook-hdata.c hook/wee-hook-hdata.h
-  hook/wee-hook-hsignal.c hook/wee-hook-hsignal.h
-  hook/wee-hook-info-hashtable.c hook/wee-hook-info-hashtable.h
-  hook/wee-hook-info.c hook/wee-hook-info.h
-  hook/wee-hook-infolist.c hook/wee-hook-infolist.h
-  hook/wee-hook-line.c hook/wee-hook-line.h
-  hook/wee-hook-modifier.c hook/wee-hook-modifier.h
-  hook/wee-hook-print.c hook/wee-hook-print.h
-  hook/wee-hook-process.c hook/wee-hook-process.h
-  hook/wee-hook-signal.c hook/wee-hook-signal.h
-  hook/wee-hook-timer.c hook/wee-hook-timer.h
-  hook/wee-hook-url.c hook/wee-hook-url.h
+  core-arraylist.c core-arraylist.h
+  core-backtrace.c core-backtrace.h
+  core-calc.c core-calc.h
+  core-command.c core-command.h
+  core-completion.c core-completion.h
+  core-config.c core-config.h
+  core-config-file.c core-config-file.h
+  core-crypto.c core-crypto.h
+  core-debug.c core-debug.h
+  core-dir.c core-dir.h
+  core-doc.c core-doc.h
+  core-eval.c core-eval.h
+  core-hashtable.c core-hashtable.h
+  core-hdata.c core-hdata.h
+  core-hook.c core-hook.h
+  core-infolist.c core-infolist.h
+  core-input.c core-input.h
+  core-list.c core-list.h
+  core-log.c core-log.h
+  core-network.c core-network.h
+  core-proxy.c core-proxy.h
+  core-secure.c core-secure.h
+  core-secure-buffer.c core-secure-buffer.h
+  core-secure-config.c core-secure-config.h
+  core-signal.c core-signal.h
+  core-string.c core-string.h
+  core-sys.c core-sys.h
+  core-upgrade.c core-upgrade.h
+  core-upgrade-file.c core-upgrade-file.h
+  core-url.c core-url.h
+  core-utf8.c core-utf8.h
+  core-util.c core-util.h
+  core-version.c core-version.h
+  hook/hook-command-run.c hook/hook-command-run.h
+  hook/hook-command.c hook/hook-command.h
+  hook/hook-completion.c hook/hook-completion.h
+  hook/hook-config.c hook/hook-config.h
+  hook/hook-connect.c hook/hook-connect.h
+  hook/hook-fd.c hook/hook-fd.h
+  hook/hook-focus.c hook/hook-focus.h
+  hook/hook-hdata.c hook/hook-hdata.h
+  hook/hook-hsignal.c hook/hook-hsignal.h
+  hook/hook-info-hashtable.c hook/hook-info-hashtable.h
+  hook/hook-info.c hook/hook-info.h
+  hook/hook-infolist.c hook/hook-infolist.h
+  hook/hook-line.c hook/hook-line.h
+  hook/hook-modifier.c hook/hook-modifier.h
+  hook/hook-print.c hook/hook-print.h
+  hook/hook-process.c hook/hook-process.h
+  hook/hook-signal.c hook/hook-signal.h
+  hook/hook-timer.c hook/hook-timer.h
+  hook/hook-url.c hook/hook-url.h
 )
 
 # Check for flock support
diff --git a/src/core/wee-arraylist.c b/src/core/core-arraylist.c
index 4be3b76cf..44320b3f3 100644
--- a/src/core/wee-arraylist.c
+++ b/src/core/core-arraylist.c
@@ -1,5 +1,5 @@
 /*
- * wee-arraylist.c - array lists management
+ * core-arraylist.c - array lists management
  *
  * Copyright (C) 2014-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,9 +27,9 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-arraylist.h"
-#include "wee-log.h"
-#include "wee-string.h"
+#include "core-arraylist.h"
+#include "core-log.h"
+#include "core-string.h"
 
 
 /*
diff --git a/src/core/wee-arraylist.h b/src/core/core-arraylist.h
index d8a6d3214..d8a6d3214 100644
--- a/src/core/wee-arraylist.h
+++ b/src/core/core-arraylist.h
diff --git a/src/core/wee-backtrace.c b/src/core/core-backtrace.c
index d28af5eee..64975dfe3 100644
--- a/src/core/wee-backtrace.c
+++ b/src/core/core-backtrace.c
@@ -1,5 +1,5 @@
 /*
- * wee-backtrace.c - backtrace after a segfault
+ * core-backtrace.c - backtrace after a segfault
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -39,10 +39,10 @@
 #endif
 
 #include "weechat.h"
-#include "wee-backtrace.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-version.h"
+#include "core-backtrace.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-version.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-backtrace.h b/src/core/core-backtrace.h
index 1549c2fee..1549c2fee 100644
--- a/src/core/wee-backtrace.h
+++ b/src/core/core-backtrace.h
diff --git a/src/core/wee-calc.c b/src/core/core-calc.c
index 0c71bd201..e9989b1a8 100644
--- a/src/core/wee-calc.c
+++ b/src/core/core-calc.c
@@ -1,5 +1,5 @@
 /*
- * wee-calc.c - calculate result of an expression
+ * core-calc.c - calculate result of an expression
  *
  * Copyright (C) 2019-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -30,8 +30,8 @@
 #include <locale.h>
 
 #include "weechat.h"
-#include "wee-arraylist.h"
-#include "wee-string.h"
+#include "core-arraylist.h"
+#include "core-string.h"
 
 enum t_calc_symbol
 {
diff --git a/src/core/wee-calc.h b/src/core/core-calc.h
index 1ba3c2306..1ba3c2306 100644
--- a/src/core/wee-calc.h
+++ b/src/core/core-calc.h
diff --git a/src/core/wee-command.c b/src/core/core-command.c
index cc96fd9b5..81e38f599 100644
--- a/src/core/wee-command.c
+++ b/src/core/core-command.c
@@ -1,5 +1,5 @@
 /*
- * wee-command.c - WeeChat core commands
+ * core-command.c - WeeChat core commands
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -45,32 +45,32 @@
 #endif
 
 #include "weechat.h"
-#include "wee-command.h"
-#include "wee-arraylist.h"
-#include "wee-config.h"
-#include "wee-config-file.h"
-#include "wee-debug.h"
-#include "wee-dir.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-input.h"
-#include "wee-list.h"
-#include "wee-log.h"
-#include "wee-network.h"
-#include "wee-proxy.h"
-#include "wee-secure.h"
-#include "wee-secure-buffer.h"
-#include "wee-secure-config.h"
-#include "wee-signal.h"
-#include "wee-string.h"
-#include "wee-sys.h"
-#include "wee-upgrade.h"
-#include "wee-url.h"
-#include "wee-utf8.h"
-#include "wee-util.h"
-#include "wee-version.h"
+#include "core-command.h"
+#include "core-arraylist.h"
+#include "core-config.h"
+#include "core-config-file.h"
+#include "core-debug.h"
+#include "core-dir.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-input.h"
+#include "core-list.h"
+#include "core-log.h"
+#include "core-network.h"
+#include "core-proxy.h"
+#include "core-secure.h"
+#include "core-secure-buffer.h"
+#include "core-secure-config.h"
+#include "core-signal.h"
+#include "core-string.h"
+#include "core-sys.h"
+#include "core-upgrade.h"
+#include "core-url.h"
+#include "core-utf8.h"
+#include "core-util.h"
+#include "core-version.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-bar-item-custom.h"
diff --git a/src/core/wee-command.h b/src/core/core-command.h
index ec7d7fb73..ec7d7fb73 100644
--- a/src/core/wee-command.h
+++ b/src/core/core-command.h
diff --git a/src/core/wee-completion.c b/src/core/core-completion.c
index ff6fcfcea..598859b67 100644
--- a/src/core/wee-completion.c
+++ b/src/core/core-completion.c
@@ -1,5 +1,5 @@
 /*
- * wee-completion.c - completion for WeeChat commands
+ * core-completion.c - completion for WeeChat commands
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -34,16 +34,16 @@
 #include <unistd.h>
 
 #include "weechat.h"
-#include "wee-arraylist.h"
-#include "wee-config.h"
-#include "wee-dir.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-hook.h"
-#include "wee-list.h"
-#include "wee-proxy.h"
-#include "wee-secure.h"
-#include "wee-string.h"
+#include "core-arraylist.h"
+#include "core-config.h"
+#include "core-dir.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-hook.h"
+#include "core-list.h"
+#include "core-proxy.h"
+#include "core-secure.h"
+#include "core-string.h"
 #include "../gui/gui-completion.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
diff --git a/src/core/wee-completion.h b/src/core/core-completion.h
index 5ece46c95..5ece46c95 100644
--- a/src/core/wee-completion.h
+++ b/src/core/core-completion.h
diff --git a/src/core/wee-config-file.c b/src/core/core-config-file.c
index 7ce1ac771..ec637bc11 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/core-config-file.c
@@ -1,5 +1,5 @@
 /*
- * wee-config-file.c - configuration files/sections/options management
+ * core-config-file.c - configuration files/sections/options management
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -34,17 +34,17 @@
 #include <errno.h>
 
 #include "weechat.h"
-#include "wee-config-file.h"
-#include "wee-arraylist.h"
-#include "wee-config.h"
-#include "wee-dir.h"
-#include "wee-hashtable.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-infolist.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-version.h"
+#include "core-config-file.h"
+#include "core-arraylist.h"
+#include "core-config.h"
+#include "core-dir.h"
+#include "core-hashtable.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-infolist.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-version.h"
 #include "../gui/gui-color.h"
 #include "../gui/gui-chat.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-config-file.h b/src/core/core-config-file.h
index 643080535..643080535 100644
--- a/src/core/wee-config-file.h
+++ b/src/core/core-config-file.h
diff --git a/src/core/wee-config.c b/src/core/core-config.c
index 23a5d9a83..5a5b5b4d5 100644
--- a/src/core/wee-config.c
+++ b/src/core/core-config.c
@@ -1,5 +1,5 @@
 /*
- * wee-config.c - WeeChat configuration options (file weechat.conf)
+ * core-config.c - WeeChat configuration options (file weechat.conf)
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -36,19 +36,19 @@
 #include <regex.h>
 
 #include "weechat.h"
-#include "wee-arraylist.h"
-#include "wee-config.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-hook.h"
-#include "wee-log.h"
-#include "wee-network.h"
-#include "wee-utf8.h"
-#include "wee-list.h"
-#include "wee-proxy.h"
-#include "wee-string.h"
-#include "wee-sys.h"
-#include "wee-version.h"
+#include "core-arraylist.h"
+#include "core-config.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-hook.h"
+#include "core-log.h"
+#include "core-network.h"
+#include "core-utf8.h"
+#include "core-list.h"
+#include "core-proxy.h"
+#include "core-string.h"
+#include "core-sys.h"
+#include "core-version.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-bar-item-custom.h"
diff --git a/src/core/wee-config.h b/src/core/core-config.h
index 90defba21..55febe40f 100644
--- a/src/core/wee-config.h
+++ b/src/core/core-config.h
@@ -24,7 +24,7 @@
 #include <regex.h>
 #include <wctype.h>
 
-#include "wee-config-file.h"
+#include "core-config-file.h"
 
 struct t_gui_buffer;
 
diff --git a/src/core/wee-crypto.c b/src/core/core-crypto.c
index d2db6a7b8..c6619e2f4 100644
--- a/src/core/wee-crypto.c
+++ b/src/core/core-crypto.c
@@ -1,5 +1,5 @@
 /*
- * wee-crypto.c - cryptographic functions
+ * core-crypto.c - cryptographic functions
  *
  * Copyright (C) 2018-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -32,10 +32,10 @@
 #include <gcrypt.h>
 
 #include "weechat.h"
-#include "wee-crypto.h"
-#include "wee-config-file.h"
-#include "wee-hashtable.h"
-#include "wee-string.h"
+#include "core-crypto.h"
+#include "core-config-file.h"
+#include "core-hashtable.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 char *weecrypto_hash_algo_string[] = {
diff --git a/src/core/wee-crypto.h b/src/core/core-crypto.h
index a749ebc39..a749ebc39 100644
--- a/src/core/wee-crypto.h
+++ b/src/core/core-crypto.h
diff --git a/src/core/wee-debug.c b/src/core/core-debug.c
index d9bdec6eb..fb40dcb71 100644
--- a/src/core/wee-debug.c
+++ b/src/core/core-debug.c
@@ -1,5 +1,5 @@
 /*
- * wee-debug.c - debug functions
+ * core-debug.c - debug functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -43,18 +43,18 @@
 #include <gnutls/gnutls.h>
 
 #include "weechat.h"
-#include "wee-backtrace.h"
-#include "wee-config-file.h"
-#include "wee-hashtable.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-infolist.h"
-#include "wee-list.h"
-#include "wee-log.h"
-#include "wee-proxy.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
-#include "wee-util.h"
+#include "core-backtrace.h"
+#include "core-config-file.h"
+#include "core-hashtable.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-infolist.h"
+#include "core-list.h"
+#include "core-log.h"
+#include "core-proxy.h"
+#include "core-string.h"
+#include "core-utf8.h"
+#include "core-util.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-buffer.h"
diff --git a/src/core/wee-debug.h b/src/core/core-debug.h
index 120445c7d..120445c7d 100644
--- a/src/core/wee-debug.h
+++ b/src/core/core-debug.h
diff --git a/src/core/wee-dir.c b/src/core/core-dir.c
index d3c6ed426..d0cf0ea38 100644
--- a/src/core/wee-dir.c
+++ b/src/core/core-dir.c
@@ -1,5 +1,5 @@
 /*
- * wee-dir.c - directory/file functions
+ * core-dir.c - directory/file functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -50,8 +50,8 @@
 #endif
 
 #include "weechat.h"
-#include "wee-config.h"
-#include "wee-string.h"
+#include "core-config.h"
+#include "core-string.h"
 
 
 /*
diff --git a/src/core/wee-dir.h b/src/core/core-dir.h
index e2ea9f30d..e2ea9f30d 100644
--- a/src/core/wee-dir.h
+++ b/src/core/core-dir.h
diff --git a/src/core/wee-doc.c b/src/core/core-doc.c
index 6a5a3cf57..2a0ce8f54 100644
--- a/src/core/wee-doc.c
+++ b/src/core/core-doc.c
@@ -1,5 +1,5 @@
 /*
- * wee-doc.c - documentation generator
+ * core-doc.c - documentation generator
  *
  * Copyright (C) 2023-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -33,18 +33,18 @@
 #include <regex.h>
 
 #include "weechat.h"
-#include "wee-arraylist.h"
-#include "wee-command.h"
-#include "wee-config-file.h"
-#include "wee-crypto.h"
-#include "wee-dir.h"
-#include "wee-hashtable.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-infolist.h"
-#include "wee-string.h"
-#include "wee-url.h"
-#include "wee-utf8.h"
+#include "core-arraylist.h"
+#include "core-command.h"
+#include "core-config-file.h"
+#include "core-crypto.h"
+#include "core-dir.h"
+#include "core-hashtable.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-infolist.h"
+#include "core-string.h"
+#include "core-url.h"
+#include "core-utf8.h"
 #include "../plugins/plugin.h"
 
 #define ESCAPE_TABLE(msg) (doc_gen_escape_table (msg))
diff --git a/src/core/wee-doc.h b/src/core/core-doc.h
index 3eb4428da..3eb4428da 100644
--- a/src/core/wee-doc.h
+++ b/src/core/core-doc.h
diff --git a/src/core/wee-eval.c b/src/core/core-eval.c
index fef8a8949..06bde6c2d 100644
--- a/src/core/wee-eval.c
+++ b/src/core/core-eval.c
@@ -1,5 +1,5 @@
 /*
- * wee-eval.c - evaluate expressions with references to internal vars
+ * core-eval.c - evaluate expressions with references to internal vars
  *
  * Copyright (C) 2012-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -31,16 +31,16 @@
 #include <sys/time.h>
 
 #include "weechat.h"
-#include "wee-eval.h"
-#include "wee-calc.h"
-#include "wee-config.h"
-#include "wee-hashtable.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-secure.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
-#include "wee-util.h"
+#include "core-eval.h"
+#include "core-calc.h"
+#include "core-config.h"
+#include "core-hashtable.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-secure.h"
+#include "core-string.h"
+#include "core-utf8.h"
+#include "core-util.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
diff --git a/src/core/wee-eval.h b/src/core/core-eval.h
index efc7cd4e4..efc7cd4e4 100644
--- a/src/core/wee-eval.h
+++ b/src/core/core-eval.h
diff --git a/src/core/wee-hashtable.c b/src/core/core-hashtable.c
index 4716eb7b6..b7c92a90f 100644
--- a/src/core/wee-hashtable.c
+++ b/src/core/core-hashtable.c
@@ -1,5 +1,5 @@
 /*
- * wee-hashtable.c - implementation of hashtable
+ * core-hashtable.c - implementation of hashtable
  *
  * Copyright (C) 2010-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,12 +29,12 @@
 #include <time.h>
 
 #include "weechat.h"
-#include "wee-hashtable.h"
-#include "wee-infolist.h"
-#include "wee-list.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
+#include "core-hashtable.h"
+#include "core-infolist.h"
+#include "core-list.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-utf8.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-hashtable.h b/src/core/core-hashtable.h
index 9ba78e1a3..9ba78e1a3 100644
--- a/src/core/wee-hashtable.h
+++ b/src/core/core-hashtable.h
diff --git a/src/core/wee-hdata.c b/src/core/core-hdata.c
index 0a3dc6a30..a3f4e195d 100644
--- a/src/core/wee-hdata.c
+++ b/src/core/core-hdata.c
@@ -1,5 +1,5 @@
 /*
- * wee-hdata.c - direct access to WeeChat data using hashtables
+ * core-hdata.c - direct access to WeeChat data using hashtables
  *
  * Copyright (C) 2011-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,12 +27,12 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-log.h"
-#include "wee-string.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-log.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-hdata.h b/src/core/core-hdata.h
index 078c06f47..078c06f47 100644
--- a/src/core/wee-hdata.h
+++ b/src/core/core-hdata.h
diff --git a/src/core/wee-hook.c b/src/core/core-hook.c
index 893466576..d89c2f988 100644
--- a/src/core/wee-hook.c
+++ b/src/core/core-hook.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook.c - WeeChat hooks management
+ * core-hook.c - WeeChat hooks management
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -32,14 +32,14 @@
 #include <errno.h>
 
 #include "weechat.h"
-#include "wee-debug.h"
-#include "wee-hook.h"
-#include "wee-hashtable.h"
-#include "wee-infolist.h"
-#include "wee-log.h"
-#include "wee-signal.h"
-#include "wee-string.h"
-#include "wee-util.h"
+#include "core-debug.h"
+#include "core-hook.h"
+#include "core-hashtable.h"
+#include "core-infolist.h"
+#include "core-log.h"
+#include "core-signal.h"
+#include "core-string.h"
+#include "core-util.h"
 #include "../gui/gui-chat.h"
 #include "../plugins/plugin.h"
 
diff --git a/src/core/wee-hook.h b/src/core/core-hook.h
index 329799697..fbe532895 100644
--- a/src/core/wee-hook.h
+++ b/src/core/core-hook.h
@@ -22,25 +22,25 @@
 
 struct t_hook;
 
-#include "hook/wee-hook-command-run.h"
-#include "hook/wee-hook-command.h"
-#include "hook/wee-hook-completion.h"
-#include "hook/wee-hook-config.h"
-#include "hook/wee-hook-connect.h"
-#include "hook/wee-hook-fd.h"
-#include "hook/wee-hook-focus.h"
-#include "hook/wee-hook-hdata.h"
-#include "hook/wee-hook-hsignal.h"
-#include "hook/wee-hook-info-hashtable.h"
-#include "hook/wee-hook-info.h"
-#include "hook/wee-hook-infolist.h"
-#include "hook/wee-hook-line.h"
-#include "hook/wee-hook-modifier.h"
-#include "hook/wee-hook-print.h"
-#include "hook/wee-hook-process.h"
-#include "hook/wee-hook-signal.h"
-#include "hook/wee-hook-timer.h"
-#include "hook/wee-hook-url.h"
+#include "hook/hook-command-run.h"
+#include "hook/hook-command.h"
+#include "hook/hook-completion.h"
+#include "hook/hook-config.h"
+#include "hook/hook-connect.h"
+#include "hook/hook-fd.h"
+#include "hook/hook-focus.h"
+#include "hook/hook-hdata.h"
+#include "hook/hook-hsignal.h"
+#include "hook/hook-info-hashtable.h"
+#include "hook/hook-info.h"
+#include "hook/hook-infolist.h"
+#include "hook/hook-line.h"
+#include "hook/hook-modifier.h"
+#include "hook/hook-print.h"
+#include "hook/hook-process.h"
+#include "hook/hook-signal.h"
+#include "hook/hook-timer.h"
+#include "hook/hook-url.h"
 
 struct t_gui_bar;
 struct t_gui_buffer;
diff --git a/src/core/wee-infolist.c b/src/core/core-infolist.c
index 091faa4c0..652482db5 100644
--- a/src/core/wee-infolist.c
+++ b/src/core/core-infolist.c
@@ -1,5 +1,5 @@
 /*
- * wee-infolist.c - info lists management
+ * core-infolist.c - info lists management
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,9 +27,9 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-infolist.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-infolist.h"
 
 
 struct t_infolist *weechat_infolists = NULL;
diff --git a/src/core/wee-infolist.h b/src/core/core-infolist.h
index b4d2589a6..b4d2589a6 100644
--- a/src/core/wee-infolist.h
+++ b/src/core/core-infolist.h
diff --git a/src/core/wee-input.c b/src/core/core-input.c
index f1b1ec8d6..b1585642d 100644
--- a/src/core/wee-input.c
+++ b/src/core/core-input.c
@@ -1,5 +1,5 @@
 /*
- * wee-input.c - default input callback for buffers
+ * core-input.c - default input callback for buffers
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,11 +27,11 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-input.h"
-#include "wee-config.h"
-#include "wee-hook.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
+#include "core-input.h"
+#include "core-config.h"
+#include "core-hook.h"
+#include "core-string.h"
+#include "core-utf8.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-filter.h"
diff --git a/src/core/wee-input.h b/src/core/core-input.h
index 57ab5d10e..57ab5d10e 100644
--- a/src/core/wee-input.h
+++ b/src/core/core-input.h
diff --git a/src/core/wee-list.c b/src/core/core-list.c
index 9f35b910b..62634ffbe 100644
--- a/src/core/wee-list.c
+++ b/src/core/core-list.c
@@ -1,5 +1,5 @@
 /*
- * wee-list.c - sorted lists
+ * core-list.c - sorted lists
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,9 +27,9 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-list.h"
-#include "wee-log.h"
-#include "wee-string.h"
+#include "core-list.h"
+#include "core-log.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-list.h b/src/core/core-list.h
index 8fc166151..8fc166151 100644
--- a/src/core/wee-list.h
+++ b/src/core/core-list.h
diff --git a/src/core/wee-log.c b/src/core/core-log.c
index 24b9253e5..d62a705e3 100644
--- a/src/core/wee-log.c
+++ b/src/core/core-log.c
@@ -1,5 +1,5 @@
 /*
- * wee-log.c - WeeChat log file (weechat.log)
+ * core-log.c - WeeChat log file (weechat.log)
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -38,10 +38,10 @@
 #include <time.h>
 
 #include "weechat.h"
-#include "wee-log.h"
-#include "wee-debug.h"
-#include "wee-string.h"
-#include "wee-version.h"
+#include "core-log.h"
+#include "core-debug.h"
+#include "core-string.h"
+#include "core-version.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-log.h b/src/core/core-log.h
index 10ed4946c..10ed4946c 100644
--- a/src/core/wee-log.h
+++ b/src/core/core-log.h
diff --git a/src/core/wee-network.c b/src/core/core-network.c
index dc26a38a5..29de231cf 100644
--- a/src/core/wee-network.c
+++ b/src/core/core-network.c
@@ -1,5 +1,5 @@
 /*
- * wee-network.c - network functions
+ * core-network.c - network functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2005-2010 Emmanuel Bouthenot <kolter@openics.org>
@@ -55,14 +55,14 @@
 #include <gnutls/gnutls.h>
 
 #include "weechat.h"
-#include "wee-network.h"
-#include "wee-config.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-hook.h"
-#include "wee-config.h"
-#include "wee-proxy.h"
-#include "wee-string.h"
+#include "core-network.h"
+#include "core-config.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-hook.h"
+#include "core-config.h"
+#include "core-proxy.h"
+#include "core-string.h"
 #include "../gui/gui-chat.h"
 #include "../plugins/plugin.h"
 
diff --git a/src/core/wee-network.h b/src/core/core-network.h
index 8849c9fd0..8849c9fd0 100644
--- a/src/core/wee-network.h
+++ b/src/core/core-network.h
diff --git a/src/core/wee-proxy.c b/src/core/core-proxy.c
index b7b72fc6e..705776cdf 100644
--- a/src/core/wee-proxy.c
+++ b/src/core/core-proxy.c
@@ -1,5 +1,5 @@
 /*
- * wee-proxy.c - proxy functions
+ * core-proxy.c - proxy functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -28,12 +28,12 @@
 #include <string.h>
 
 #include "weechat.h"
-#include "wee-proxy.h"
-#include "wee-config.h"
-#include "wee-hdata.h"
-#include "wee-infolist.h"
-#include "wee-log.h"
-#include "wee-string.h"
+#include "core-proxy.h"
+#include "core-config.h"
+#include "core-hdata.h"
+#include "core-infolist.h"
+#include "core-log.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-proxy.h b/src/core/core-proxy.h
index 67f7f7a05..67f7f7a05 100644
--- a/src/core/wee-proxy.h
+++ b/src/core/core-proxy.h
diff --git a/src/core/wee-secure-buffer.c b/src/core/core-secure-buffer.c
index ac3cedb13..70661d2cf 100644
--- a/src/core/wee-secure-buffer.c
+++ b/src/core/core-secure-buffer.c
@@ -1,5 +1,5 @@
 /*
- * wee-secure-buffer.c - secured data buffer
+ * core-secure-buffer.c - secured data buffer
  *
  * Copyright (C) 2013-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,13 +29,13 @@
 #include <gcrypt.h>
 
 #include "weechat.h"
-#include "wee-config-file.h"
-#include "wee-crypto.h"
-#include "wee-hashtable.h"
-#include "wee-secure.h"
-#include "wee-secure-buffer.h"
-#include "wee-secure-config.h"
-#include "wee-string.h"
+#include "core-config-file.h"
+#include "core-crypto.h"
+#include "core-hashtable.h"
+#include "core-secure.h"
+#include "core-secure-buffer.h"
+#include "core-secure-config.h"
+#include "core-string.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
diff --git a/src/core/wee-secure-buffer.h b/src/core/core-secure-buffer.h
index 286de6e67..286de6e67 100644
--- a/src/core/wee-secure-buffer.h
+++ b/src/core/core-secure-buffer.h
diff --git a/src/core/wee-secure-config.c b/src/core/core-secure-config.c
index 20b144d5e..908628edf 100644
--- a/src/core/wee-secure-config.c
+++ b/src/core/core-secure-config.c
@@ -1,5 +1,5 @@
 /*
- * wee-secure-config.c - secured data configuration options (file sec.conf)
+ * core-secure-config.c - secured data configuration options (file sec.conf)
  *
  * Copyright (C) 2013-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,12 +29,12 @@
 #include <gcrypt.h>
 
 #include "weechat.h"
-#include "wee-config-file.h"
-#include "wee-crypto.h"
-#include "wee-hashtable.h"
-#include "wee-secure.h"
-#include "wee-secure-config.h"
-#include "wee-string.h"
+#include "core-config-file.h"
+#include "core-crypto.h"
+#include "core-hashtable.h"
+#include "core-secure.h"
+#include "core-secure-config.h"
+#include "core-string.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-main.h"
 #include "../gui/gui-window.h"
diff --git a/src/core/wee-secure-config.h b/src/core/core-secure-config.h
index f14eee82a..f14eee82a 100644
--- a/src/core/wee-secure-config.h
+++ b/src/core/core-secure-config.h
diff --git a/src/core/wee-secure.c b/src/core/core-secure.c
index 283f49aca..66abab5c8 100644
--- a/src/core/wee-secure.c
+++ b/src/core/core-secure.c
@@ -1,5 +1,5 @@
 /*
- * wee-secure.c - secured data
+ * core-secure.c - secured data
  *
  * Copyright (C) 2013-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -28,13 +28,13 @@
 #include <gcrypt.h>
 
 #include "weechat.h"
-#include "wee-config-file.h"
-#include "wee-crypto.h"
-#include "wee-hashtable.h"
-#include "wee-hook.h"
-#include "wee-secure.h"
-#include "wee-secure-config.h"
-#include "wee-string.h"
+#include "core-config-file.h"
+#include "core-crypto.h"
+#include "core-hashtable.h"
+#include "core-hook.h"
+#include "core-secure.h"
+#include "core-secure-config.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 /* the passphrase used to encrypt/decrypt data */
diff --git a/src/core/wee-secure.h b/src/core/core-secure.h
index f2d3f80cb..f2d3f80cb 100644
--- a/src/core/wee-secure.h
+++ b/src/core/core-secure.h
diff --git a/src/core/wee-signal.c b/src/core/core-signal.c
index 95fbe785d..3f28fe8e8 100644
--- a/src/core/wee-signal.c
+++ b/src/core/core-signal.c
@@ -1,5 +1,5 @@
 /*
- * wee-signal.c - signal functions
+ * core-signal.c - signal functions
  *
  * Copyright (C) 2021-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,14 +29,14 @@
 #include <signal.h>
 
 #include "weechat.h"
-#include "wee-signal.h"
-#include "wee-config.h"
-#include "wee-debug.h"
-#include "wee-eval.h"
-#include "wee-hook.h"
-#include "wee-input.h"
-#include "wee-log.h"
-#include "wee-string.h"
+#include "core-signal.h"
+#include "core-config.h"
+#include "core-debug.h"
+#include "core-eval.h"
+#include "core-hook.h"
+#include "core-input.h"
+#include "core-log.h"
+#include "core-string.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-window.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-signal.h b/src/core/core-signal.h
index 6f87a72d2..6f87a72d2 100644
--- a/src/core/wee-signal.h
+++ b/src/core/core-signal.h
diff --git a/src/core/wee-string.c b/src/core/core-string.c
index 60457d516..572e6d1cd 100644
--- a/src/core/wee-string.c
+++ b/src/core/core-string.c
@@ -1,5 +1,5 @@
 /*
- * wee-string.c - string functions
+ * core-string.c - string functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -49,11 +49,11 @@
 #endif /* ICONV_CONST */
 
 #include "weechat.h"
-#include "wee-string.h"
-#include "wee-config.h"
-#include "wee-eval.h"
-#include "wee-hashtable.h"
-#include "wee-utf8.h"
+#include "core-string.h"
+#include "core-config.h"
+#include "core-eval.h"
+#include "core-hashtable.h"
+#include "core-utf8.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-string.h b/src/core/core-string.h
index e79ce6279..e79ce6279 100644
--- a/src/core/wee-string.h
+++ b/src/core/core-string.h
diff --git a/src/core/wee-sys.c b/src/core/core-sys.c
index c481b4c68..888ed5200 100644
--- a/src/core/wee-sys.c
+++ b/src/core/core-sys.c
@@ -1,5 +1,5 @@
 /*
- * wee-sys.c - system actions
+ * core-sys.c - system actions
  *
  * Copyright (C) 2023-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -35,11 +35,11 @@
 #include <sys/wait.h>
 
 #include "weechat.h"
-#include "wee-config.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-sys.h"
-#include "wee-util.h"
+#include "core-config.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-sys.h"
+#include "core-util.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-window.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-sys.h b/src/core/core-sys.h
index 6ad8e1d98..6ad8e1d98 100644
--- a/src/core/wee-sys.h
+++ b/src/core/core-sys.h
diff --git a/src/core/wee-upgrade-file.c b/src/core/core-upgrade-file.c
index 4619b3f3d..6aba2792b 100644
--- a/src/core/wee-upgrade-file.c
+++ b/src/core/core-upgrade-file.c
@@ -1,5 +1,5 @@
 /*
- * wee-upgrade-file.c - save/restore data for upgrading WeeChat
+ * core-upgrade-file.c - save/restore data for upgrading WeeChat
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -32,10 +32,10 @@
 #include <sys/stat.h>
 
 #include "weechat.h"
-#include "wee-upgrade-file.h"
-#include "wee-infolist.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
+#include "core-upgrade-file.h"
+#include "core-infolist.h"
+#include "core-string.h"
+#include "core-utf8.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-main.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-upgrade-file.h b/src/core/core-upgrade-file.h
index fe205251e..fe205251e 100644
--- a/src/core/wee-upgrade-file.h
+++ b/src/core/core-upgrade-file.h
diff --git a/src/core/wee-upgrade.c b/src/core/core-upgrade.c
index 497065e2f..bca288aea 100644
--- a/src/core/wee-upgrade.c
+++ b/src/core/core-upgrade.c
@@ -1,5 +1,5 @@
 /*
- * wee-upgrade.c - save/restore session data of WeeChat core
+ * core-upgrade.c - save/restore session data of WeeChat core
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,13 +29,13 @@
 #include <sys/time.h>
 
 #include "weechat.h"
-#include "wee-upgrade.h"
-#include "wee-dir.h"
-#include "wee-hook.h"
-#include "wee-infolist.h"
-#include "wee-secure-buffer.h"
-#include "wee-string.h"
-#include "wee-util.h"
+#include "core-upgrade.h"
+#include "core-dir.h"
+#include "core-hook.h"
+#include "core-infolist.h"
+#include "core-secure-buffer.h"
+#include "core-string.h"
+#include "core-util.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
diff --git a/src/core/wee-upgrade.h b/src/core/core-upgrade.h
index 91d98e632..24c413f8b 100644
--- a/src/core/wee-upgrade.h
+++ b/src/core/core-upgrade.h
@@ -20,7 +20,7 @@
 #ifndef WEECHAT_UPGRADE_H
 #define WEECHAT_UPGRADE_H
 
-#include "wee-upgrade-file.h"
+#include "core-upgrade-file.h"
 
 #define WEECHAT_UPGRADE_FILENAME "weechat"
 
diff --git a/src/core/wee-url.c b/src/core/core-url.c
index 9288eb8e1..e9eb3cb93 100644
--- a/src/core/wee-url.c
+++ b/src/core/core-url.c
@@ -1,5 +1,5 @@
 /*
- * wee-url.c - URL transfer
+ * core-url.c - URL transfer
  *
  * Copyright (C) 2012-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -29,12 +29,12 @@
 #include <curl/curl.h>
 
 #include "weechat.h"
-#include "wee-url.h"
-#include "wee-config.h"
-#include "wee-hashtable.h"
-#include "wee-infolist.h"
-#include "wee-proxy.h"
-#include "wee-string.h"
+#include "core-url.h"
+#include "core-config.h"
+#include "core-hashtable.h"
+#include "core-infolist.h"
+#include "core-proxy.h"
+#include "core-string.h"
 #include "../plugins/plugin.h"
 
 
diff --git a/src/core/wee-url.h b/src/core/core-url.h
index 770fab92d..770fab92d 100644
--- a/src/core/wee-url.h
+++ b/src/core/core-url.h
diff --git a/src/core/wee-utf8.c b/src/core/core-utf8.c
index 019719caf..310a74f4f 100644
--- a/src/core/wee-utf8.c
+++ b/src/core/core-utf8.c
@@ -1,5 +1,5 @@
 /*
- * wee-utf8.c - UTF-8 string functions
+ * core-utf8.c - UTF-8 string functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2006 Emmanuel Bouthenot <kolter@openics.org>
@@ -29,9 +29,9 @@
 #include <wctype.h>
 
 #include "weechat.h"
-#include "wee-utf8.h"
-#include "wee-config.h"
-#include "wee-string.h"
+#include "core-utf8.h"
+#include "core-config.h"
+#include "core-string.h"
 
 
 int local_utf8 = 0;
diff --git a/src/core/wee-utf8.h b/src/core/core-utf8.h
index feaa5b8c7..feaa5b8c7 100644
--- a/src/core/wee-utf8.h
+++ b/src/core/core-utf8.h
diff --git a/src/core/wee-util.c b/src/core/core-util.c
index be4a868bd..4b95b523e 100644
--- a/src/core/wee-util.c
+++ b/src/core/core-util.c
@@ -1,5 +1,5 @@
 /*
- * wee-util.c - some useful functions
+ * core-util.c - some useful functions
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -36,11 +36,11 @@
 #include <time.h>
 
 #include "weechat.h"
-#include "wee-util.h"
-#include "wee-config.h"
-#include "wee-log.h"
-#include "wee-string.h"
-#include "wee-utf8.h"
+#include "core-util.h"
+#include "core-config.h"
+#include "core-log.h"
+#include "core-string.h"
+#include "core-utf8.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-window.h"
 #include "../plugins/plugin.h"
diff --git a/src/core/wee-util.h b/src/core/core-util.h
index 75cdf6800..75cdf6800 100644
--- a/src/core/wee-util.h
+++ b/src/core/core-util.h
diff --git a/src/core/wee-version.c b/src/core/core-version.c
index e5b8444dc..c6a2a379b 100644
--- a/src/core/wee-version.c
+++ b/src/core/core-version.c
@@ -1,5 +1,5 @@
 /*
- * wee-version.c - functions for WeeChat version
+ * core-version.c - functions for WeeChat version
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
diff --git a/src/core/wee-version.h b/src/core/core-version.h
index a5027b497..a5027b497 100644
--- a/src/core/wee-version.h
+++ b/src/core/core-version.h
diff --git a/src/core/hook/wee-hook-command-run.c b/src/core/hook/hook-command-run.c
index b12cc35cf..1c72543c2 100644
--- a/src/core/hook/wee-hook-command-run.c
+++ b/src/core/hook/hook-command-run.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-command-run.c - WeeChat command_run hook
+ * hook-command-run.c - WeeChat command_run hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,11 +27,11 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
-#include "../wee-utf8.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
+#include "../core-utf8.h"
 #include "../../plugins/plugin.h"
 
 
diff --git a/src/core/hook/wee-hook-command-run.h b/src/core/hook/hook-command-run.h
index f1bd81e44..f1bd81e44 100644
--- a/src/core/hook/wee-hook-command-run.h
+++ b/src/core/hook/hook-command-run.h
diff --git a/src/core/hook/wee-hook-command.c b/src/core/hook/hook-command.c
index d25bfc28e..2558d52ab 100644
--- a/src/core/hook/wee-hook-command.c
+++ b/src/core/hook/hook-command.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-command.c - WeeChat command hook
+ * hook-command.c - WeeChat command hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,14 +27,14 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-arraylist.h"
-#include "../wee-config.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-list.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
-#include "../wee-utf8.h"
+#include "../core-arraylist.h"
+#include "../core-config.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-list.h"
+#include "../core-log.h"
+#include "../core-string.h"
+#include "../core-utf8.h"
 #include "../../gui/gui-chat.h"
 #include "../../gui/gui-filter.h"
 #include "../../plugins/plugin.h"
diff --git a/src/core/hook/wee-hook-command.h b/src/core/hook/hook-command.h
index 2afe60611..2afe60611 100644
--- a/src/core/hook/wee-hook-command.h
+++ b/src/core/hook/hook-command.h
diff --git a/src/core/hook/wee-hook-completion.c b/src/core/hook/hook-completion.c
index 7e708ff0f..063572e79 100644
--- a/src/core/hook/wee-hook-completion.c
+++ b/src/core/hook/hook-completion.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-completion.c - WeeChat completion hook
+ * hook-completion.c - WeeChat completion hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../gui/gui-completion.h"
 
 
diff --git a/src/core/hook/wee-hook-completion.h b/src/core/hook/hook-completion.h
index 2173e8d4e..2173e8d4e 100644
--- a/src/core/hook/wee-hook-completion.h
+++ b/src/core/hook/hook-completion.h
diff --git a/src/core/hook/wee-hook-config.c b/src/core/hook/hook-config.c
index aee352e93..42b158b55 100644
--- a/src/core/hook/wee-hook-config.c
+++ b/src/core/hook/hook-config.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-config.c - WeeChat config hook
+ * hook-config.c - WeeChat config hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-config.h b/src/core/hook/hook-config.h
index a12f15708..a12f15708 100644
--- a/src/core/hook/wee-hook-config.h
+++ b/src/core/hook/hook-config.h
diff --git a/src/core/hook/wee-hook-connect.c b/src/core/hook/hook-connect.c
index 1302c5d4d..d6da88ba8 100644
--- a/src/core/hook/wee-hook-connect.c
+++ b/src/core/hook/hook-connect.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-connect.c - WeeChat connect hook
+ * hook-connect.c - WeeChat connect hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  * Copyright (C) 2012 Simon Arlott
@@ -31,10 +31,10 @@
 #include <sys/wait.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-network.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-network.h"
 #include "../../plugins/plugin.h"
 
 
diff --git a/src/core/hook/wee-hook-connect.h b/src/core/hook/hook-connect.h
index 7bc7d42f6..7bc7d42f6 100644
--- a/src/core/hook/wee-hook-connect.h
+++ b/src/core/hook/hook-connect.h
diff --git a/src/core/hook/wee-hook-fd.c b/src/core/hook/hook-fd.c
index 8344dffbc..abc4f6d93 100644
--- a/src/core/hook/wee-hook-fd.c
+++ b/src/core/hook/hook-fd.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-fd.c - WeeChat fd hook
+ * hook-fd.c - WeeChat fd hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -30,9 +30,9 @@
 #include <errno.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
 #include "../../gui/gui-chat.h"
 
 
diff --git a/src/core/hook/wee-hook-fd.h b/src/core/hook/hook-fd.h
index cc6019da2..cc6019da2 100644
--- a/src/core/hook/wee-hook-fd.h
+++ b/src/core/hook/hook-fd.h
diff --git a/src/core/hook/wee-hook-focus.c b/src/core/hook/hook-focus.c
index 0e0d073e1..8731709b6 100644
--- a/src/core/hook/wee-hook-focus.c
+++ b/src/core/hook/hook-focus.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-focus.c - WeeChat focus hook
+ * hook-focus.c - WeeChat focus hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,11 +27,11 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hashtable.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hashtable.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../plugins/plugin.h"
 
 
diff --git a/src/core/hook/wee-hook-focus.h b/src/core/hook/hook-focus.h
index 08c3aff08..08c3aff08 100644
--- a/src/core/hook/wee-hook-focus.h
+++ b/src/core/hook/hook-focus.h
diff --git a/src/core/hook/wee-hook-hdata.c b/src/core/hook/hook-hdata.c
index b64cb403a..2ba924e47 100644
--- a/src/core/hook/wee-hook-hdata.c
+++ b/src/core/hook/hook-hdata.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-hdata.c - WeeChat hdata hook
+ * hook-hdata.c - WeeChat hdata hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,12 +27,12 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hashtable.h"
-#include "../wee-hdata.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hashtable.h"
+#include "../core-hdata.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-hdata.h b/src/core/hook/hook-hdata.h
index b2b0369e4..b2b0369e4 100644
--- a/src/core/hook/wee-hook-hdata.h
+++ b/src/core/hook/hook-hdata.h
diff --git a/src/core/hook/wee-hook-hsignal.c b/src/core/hook/hook-hsignal.c
index 4dc8a700c..cffd5e031 100644
--- a/src/core/hook/wee-hook-hsignal.c
+++ b/src/core/hook/hook-hsignal.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-hsignal.c - WeeChat hsignal hook
+ * hook-hsignal.c - WeeChat hsignal hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../plugins/plugin.h"
 
 
diff --git a/src/core/hook/wee-hook-hsignal.h b/src/core/hook/hook-hsignal.h
index c305b8caa..c305b8caa 100644
--- a/src/core/hook/wee-hook-hsignal.h
+++ b/src/core/hook/hook-hsignal.h
diff --git a/src/core/hook/wee-hook-info-hashtable.c b/src/core/hook/hook-info-hashtable.c
index f84577c67..72d808bf3 100644
--- a/src/core/hook/wee-hook-info-hashtable.c
+++ b/src/core/hook/hook-info-hashtable.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-info-hashtable.c - WeeChat info_hashtable hook
+ * hook-info-hashtable.c - WeeChat info_hashtable hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-info-hashtable.h b/src/core/hook/hook-info-hashtable.h
index 4b5a60688..4b5a60688 100644
--- a/src/core/hook/wee-hook-info-hashtable.h
+++ b/src/core/hook/hook-info-hashtable.h
diff --git a/src/core/hook/wee-hook-info.c b/src/core/hook/hook-info.c
index a68c223b8..498dcf9f7 100644
--- a/src/core/hook/wee-hook-info.c
+++ b/src/core/hook/hook-info.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-info.c - WeeChat info hook
+ * hook-info.c - WeeChat info hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-info.h b/src/core/hook/hook-info.h
index b262b2ecc..b262b2ecc 100644
--- a/src/core/hook/wee-hook-info.h
+++ b/src/core/hook/hook-info.h
diff --git a/src/core/hook/wee-hook-infolist.c b/src/core/hook/hook-infolist.c
index c92b28b69..4482cfa75 100644
--- a/src/core/hook/wee-hook-infolist.c
+++ b/src/core/hook/hook-infolist.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-infolist.c - WeeChat infolist hook
+ * hook-infolist.c - WeeChat infolist hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-infolist.h b/src/core/hook/hook-infolist.h
index 03ef5db6b..03ef5db6b 100644
--- a/src/core/hook/wee-hook-infolist.h
+++ b/src/core/hook/hook-infolist.h
diff --git a/src/core/hook/wee-hook-line.c b/src/core/hook/hook-line.c
index 185343c44..a8ec86a7f 100644
--- a/src/core/hook/wee-hook-line.c
+++ b/src/core/hook/hook-line.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-line.c - WeeChat line hook
+ * hook-line.c - WeeChat line hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,11 +27,11 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hashtable.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hashtable.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../gui/gui-buffer.h"
 #include "../../gui/gui-line.h"
 #include "../../plugins/plugin.h"
diff --git a/src/core/hook/wee-hook-line.h b/src/core/hook/hook-line.h
index 068a0a6b1..068a0a6b1 100644
--- a/src/core/hook/wee-hook-line.h
+++ b/src/core/hook/hook-line.h
diff --git a/src/core/hook/wee-hook-modifier.c b/src/core/hook/hook-modifier.c
index a526f801e..feac9a064 100644
--- a/src/core/hook/wee-hook-modifier.c
+++ b/src/core/hook/hook-modifier.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-modifier.c - WeeChat modifier hook
+ * hook-modifier.c - WeeChat modifier hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 
 
 /*
diff --git a/src/core/hook/wee-hook-modifier.h b/src/core/hook/hook-modifier.h
index 4552de8eb..4552de8eb 100644
--- a/src/core/hook/wee-hook-modifier.h
+++ b/src/core/hook/hook-modifier.h
diff --git a/src/core/hook/wee-hook-print.c b/src/core/hook/hook-print.c
index 91b3cd20b..54b55fdff 100644
--- a/src/core/hook/wee-hook-print.c
+++ b/src/core/hook/hook-print.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-print.c - WeeChat print hook
+ * hook-print.c - WeeChat print hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../gui/gui-buffer.h"
 #include "../../gui/gui-color.h"
 #include "../../gui/gui-line.h"
diff --git a/src/core/hook/wee-hook-print.h b/src/core/hook/hook-print.h
index 5b07af8da..5b07af8da 100644
--- a/src/core/hook/wee-hook-print.h
+++ b/src/core/hook/hook-print.h
diff --git a/src/core/hook/wee-hook-process.c b/src/core/hook/hook-process.c
index fe205f033..44668ba92 100644
--- a/src/core/hook/wee-hook-process.c
+++ b/src/core/hook/hook-process.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-process.c - WeeChat process hook
+ * hook-process.c - WeeChat process hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -32,12 +32,12 @@
 #include <errno.h>
 
 #include "../weechat.h"
-#include "../wee-hashtable.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
-#include "../wee-url.h"
+#include "../core-hashtable.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
+#include "../core-url.h"
 #include "../../gui/gui-chat.h"
 #include "../../plugins/plugin.h"
 
diff --git a/src/core/hook/wee-hook-process.h b/src/core/hook/hook-process.h
index d5cd61977..d5cd61977 100644
--- a/src/core/hook/wee-hook-process.h
+++ b/src/core/hook/hook-process.h
diff --git a/src/core/hook/wee-hook-signal.c b/src/core/hook/hook-signal.c
index 9848e0ba0..837db2e67 100644
--- a/src/core/hook/wee-hook-signal.c
+++ b/src/core/hook/hook-signal.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-signal.c - WeeChat signal hook
+ * hook-signal.c - WeeChat signal hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -27,10 +27,10 @@
 #include <string.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
 #include "../../plugins/plugin.h"
 
 
diff --git a/src/core/hook/wee-hook-signal.h b/src/core/hook/hook-signal.h
index 0dbcfa5d8..0dbcfa5d8 100644
--- a/src/core/hook/wee-hook-signal.h
+++ b/src/core/hook/hook-signal.h
diff --git a/src/core/hook/wee-hook-timer.c b/src/core/hook/hook-timer.c
index b235306d9..1fd9dd3c5 100644
--- a/src/core/hook/wee-hook-timer.c
+++ b/src/core/hook/hook-timer.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-timer.c - WeeChat timer hook
+ * hook-timer.c - WeeChat timer hook
  *
  * Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -28,10 +28,10 @@
 #include <time.h>
 
 #include "../weechat.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-util.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-util.h"
 #include "../../gui/gui-chat.h"
 
 
diff --git a/src/core/hook/wee-hook-timer.h b/src/core/hook/hook-timer.h
index 4e88f859f..4e88f859f 100644
--- a/src/core/hook/wee-hook-timer.h
+++ b/src/core/hook/hook-timer.h
diff --git a/src/core/hook/wee-hook-url.c b/src/core/hook/hook-url.c
index 097180d9a..19cef8c37 100644
--- a/src/core/hook/wee-hook-url.c
+++ b/src/core/hook/hook-url.c
@@ -1,5 +1,5 @@
 /*
- * wee-hook-url.c - WeeChat URL hook
+ * hook-url.c - WeeChat URL hook
  *
  * Copyright (C) 2023-2024 Sébastien Helleu <flashcode@flashtux.org>
  *
@@ -33,12 +33,12 @@
 #include <pthread.h>
 
 #include "../weechat.h"
-#include "../wee-hashtable.h"
-#include "../wee-hook.h"
-#include "../wee-infolist.h"
-#include "../wee-log.h"
-#include "../wee-string.h"
-#include "../wee-url.h"
+#include "../core-hashtable.h"
+#include "../core-hook.h"
+#include "../core-infolist.h"
+#include "../core-log.h"
+#include "../core-string.h"
+#include "../core-url.h"
 #include "../../gui/gui-chat.h"
 #include "../../plugins/plugin.h"
 
diff --git a/src/core/hook/wee-hook-url.h b/src/core/hook/hook-url.h
index e4ec93353..e4ec93353 100644
--- a/src/core/hook/wee-hook-url.h
+++ b/src/core/hook/hook-url.h
diff --git a/src/core/weechat.c b/src/core/weechat.c
index 51a8161cc..78ed20f5a 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -56,28 +56,28 @@
 #endif
 
 #include "weechat.h"
-#include "wee-command.h"
-#include "wee-completion.h"
-#include "wee-config.h"
-#include "wee-debug.h"
-#include "wee-dir.h"
-#include "wee-doc.h"
-#include "wee-eval.h"
-#include "wee-hdata.h"
-#include "wee-hook.h"
-#include "wee-list.h"
-#include "wee-log.h"
-#include "wee-network.h"
-#include "wee-proxy.h"
-#include "wee-secure.h"
-#include "wee-secure-config.h"
-#include "wee-signal.h"
-#include "wee-string.h"
-#include "wee-upgrade.h"
-#include "wee-url.h"
-#include "wee-utf8.h"
-#include "wee-util.h"
-#include "wee-version.h"
+#include "core-command.h"
+#include "core-completion.h"
+#include "core-config.h"
+#include "core-debug.h"
+#include "core-dir.h"
+#include "core-doc.h"
+#include "core-eval.h"
+#include "core-hdata.h"
+#include "core-hook.h"
+#include "core-list.h"
+#include "core-log.h"
+#include "core-network.h"
+#include "core-proxy.h"
+#include "core-secure.h"
+#include "core-secure-config.h"
+#include "core-signal.h"
+#include "core-string.h"
+#include "core-upgrade.h"
+#include "core-url.h"
+#include "core-utf8.h"
+#include "core-util.h"
+#include "core-version.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
 #include "../gui/gui-completion.h"
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index 6a486291b..e1c3ca938 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -28,10 +28,10 @@
 #include <limits.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-log.h"
-#include "../../core/wee-string.h"
-#include "../../core/wee-utf8.h"
+#include "../../core/core-config.h"
+#include "../../core/core-log.h"
+#include "../../core/core-string.h"
+#include "../../core/core-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-bar.h"
 #include "../gui-bar-item.h"
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index d2a0a997b..a7726cc57 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -29,13 +29,13 @@
 #include <time.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-eval.h"
-#include "../../core/wee-hashtable.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-string.h"
-#include "../../core/wee-utf8.h"
-#include "../../core/wee-util.h"
+#include "../../core/core-config.h"
+#include "../../core/core-eval.h"
+#include "../../core/core-hashtable.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-string.h"
+#include "../../core/core-utf8.h"
+#include "../../core/core-util.h"
 #include "../../plugins/plugin.h"
 #include "../gui-buffer.h"
 #include "../gui-chat.h"
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index ee455ad9b..705986be2 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -29,12 +29,12 @@
 #include <time.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-hashtable.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-list.h"
-#include "../../core/wee-string.h"
-#include "../../core/wee-utf8.h"
+#include "../../core/core-config.h"
+#include "../../core/core-hashtable.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-list.h"
+#include "../../core/core-string.h"
+#include "../../core/core-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-buffer.h"
 #include "../gui-color.h"
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c
index 2c1f7acf9..d82ce7897 100644
--- a/src/gui/curses/gui-curses-key.c
+++ b/src/gui/curses/gui-curses-key.c
@@ -29,11 +29,11 @@
 #include <time.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-log.h"
-#include "../../core/wee-utf8.h"
-#include "../../core/wee-string.h"
+#include "../../core/core-config.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-log.h"
+#include "../../core/core-utf8.h"
+#include "../../core/core-string.h"
 #include "../../plugins/plugin.h"
 #include "../gui-key.h"
 #include "../gui-buffer.h"
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index 2467c9231..2050f1b43 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -31,14 +31,14 @@
 #include <time.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-command.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-log.h"
-#include "../../core/wee-signal.h"
-#include "../../core/wee-string.h"
-#include "../../core/wee-utf8.h"
-#include "../../core/wee-version.h"
+#include "../../core/core-command.h"
+#include "../../core/core-config.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-log.h"
+#include "../../core/core-signal.h"
+#include "../../core/core-string.h"
+#include "../../core/core-utf8.h"
+#include "../../core/core-version.h"
 #include "../../plugins/plugin.h"
 #include "../gui-main.h"
 #include "../gui-bar.h"
diff --git a/src/gui/curses/gui-curses-mouse.c b/src/gui/curses/gui-curses-mouse.c
index 5f282b988..ab52e89d3 100644
--- a/src/gui/curses/gui-curses-mouse.c
+++ b/src/gui/curses/gui-curses-mouse.c
@@ -30,10 +30,10 @@
 #include <math.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-string.h"
-#include "../../core/wee-utf8.h"
+#include "../../core/core-config.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-string.h"
+#include "../../core/core-utf8.h"
 #include "../../plugins/plugin.h"
 #include "../gui-bar.h"
 #include "../gui-bar-window.h"
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index f7d9fe482..c7e287c3e 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -34,11 +34,11 @@
 #include <termios.h>
 
 #include "../../core/weechat.h"
-#include "../../core/wee-config.h"
-#include "../../core/wee-eval.h"
-#include "../../core/wee-hook.h"
-#include "../../core/wee-log.h"
-#include "../../core/wee-string.h"
+#include "../../core/core-config.h"
+#include "../../core/core-eval.h"
+#include "../../core/core-hook.h"
+#include "../../core/core-log.h"
+#include "../../core/core-string.h"
 #include "../../plugins/plugin.h"
 #include "../gui-window.h"
 #include "../gui-bar.h"
diff --git a/src/gui/gui-bar-item-custom.c b/src/gui/gui-bar-item-custom.c
index f72e5dece..15b217f63 100644
--- a/src/gui/gui-bar-item-custom.c
+++ b/src/gui/gui-bar-item-custom.c
@@ -28,11 +28,11 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-config-file.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-config-file.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-bar-item-custom.h"
 #include "gui-bar-item.h"
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index aa3ee22fe..363a2b71e 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -28,17 +28,17 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-arraylist.h"
-#include "../core/wee-config.h"
-#include "../core/wee-debug.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
-#include "../core/wee-util.h"
+#include "../core/core-arraylist.h"
+#include "../core/core-config.h"
+#include "../core/core-debug.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
+#include "../core/core-util.h"
 #include "../plugins/plugin.h"
 #include "gui-bar-item.h"
 #include "gui-bar.h"
diff --git a/src/gui/gui-bar-window.c b/src/gui/gui-bar-window.c
index 87cbc6c87..379f32c07 100644
--- a/src/gui/gui-bar-window.c
+++ b/src/gui/gui-bar-window.c
@@ -29,12 +29,12 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-bar-window.h"
 #include "gui-bar.h"
diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c
index d4c43c8fd..77085486e 100644
--- a/src/gui/gui-bar.c
+++ b/src/gui/gui-bar.c
@@ -29,14 +29,14 @@
 #include <limits.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-bar.h"
 #include "gui-bar-item.h"
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 0b0c5e8c3..0cbe44881 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -36,17 +36,17 @@
 #include <ctype.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-list.h"
-#include "../core/wee-log.h"
-#include "../core/wee-secure-buffer.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-list.h"
+#include "../core/core-log.h"
+#include "../core/core-secure-buffer.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-buffer.h"
 #include "gui-chat.h"
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 57d81a446..a1ff81322 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -33,13 +33,13 @@
 #include <regex.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
-#include "../core/wee-util.h"
+#include "../core/core-config.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hook.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
+#include "../core/core-util.h"
 #include "../plugins/plugin.h"
 #include "gui-chat.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c
index 1150b6ff8..23c8f9a71 100644
--- a/src/gui/gui-color.c
+++ b/src/gui/gui-color.c
@@ -34,11 +34,11 @@
 #include <limits.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-list.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-list.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-color.h"
 #include "gui-chat.h"
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index 50b12bbeb..d27783e8a 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -33,17 +33,17 @@
 #include <unistd.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-arraylist.h"
-#include "../core/wee-completion.h"
-#include "../core/wee-config.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-list.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-arraylist.h"
+#include "../core/core-completion.h"
+#include "../core/core-config.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-list.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-completion.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-cursor.c b/src/gui/gui-cursor.c
index 7e2b0e29d..91c40dacf 100644
--- a/src/gui/gui-cursor.c
+++ b/src/gui/gui-cursor.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-hook.h"
+#include "../core/core-hook.h"
 #include "../plugins/plugin.h"
 #include "gui-cursor.h"
 #include "gui-bar.h"
diff --git a/src/gui/gui-filter.c b/src/gui/gui-filter.c
index 6b822af25..d8c42418a 100644
--- a/src/gui/gui-filter.c
+++ b/src/gui/gui-filter.c
@@ -29,12 +29,12 @@
 #include <regex.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-filter.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-focus.c b/src/gui/gui-focus.c
index 5f3adb92a..27d7ebf06 100644
--- a/src/gui/gui-focus.c
+++ b/src/gui/gui-focus.c
@@ -27,9 +27,9 @@
 #include <stdio.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-string.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hook.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-bar.h"
 #include "gui-bar-window.h"
diff --git a/src/gui/gui-history.c b/src/gui/gui-history.c
index 5773eceb8..e2696c808 100644
--- a/src/gui/gui-history.c
+++ b/src/gui/gui-history.c
@@ -30,12 +30,12 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-history.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c
index 7b070c5ba..56bf5fe7f 100644
--- a/src/gui/gui-hotlist.c
+++ b/src/gui/gui-hotlist.c
@@ -28,15 +28,15 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-util.h"
+#include "../core/core-config.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-util.h"
 #include "../plugins/plugin.h"
 #include "gui-hotlist.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c
index ca4053c35..fe21733a5 100644
--- a/src/gui/gui-input.c
+++ b/src/gui/gui-input.c
@@ -27,11 +27,11 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-input.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-hook.h"
+#include "../core/core-input.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-input.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-key.c b/src/gui/gui-key.c
index cceb4692c..3db67ad7a 100644
--- a/src/gui/gui-key.c
+++ b/src/gui/gui-key.c
@@ -30,18 +30,18 @@
 #include <time.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-config-file.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-input.h"
-#include "../core/wee-list.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-config-file.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-input.h"
+#include "../core/core-list.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-key.h"
 #include "gui-bar.h"
diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c
index dea74f0b7..9436b9836 100644
--- a/src/gui/gui-layout.c
+++ b/src/gui/gui-layout.c
@@ -28,11 +28,11 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hdata.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-layout.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index 597d7bbe4..43eb68baa 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -30,13 +30,13 @@
 #include <regex.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "../plugins/plugin.h"
 #include "gui-line.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-nick.c b/src/gui/gui-nick.c
index 28bc1ca64..0a4ee3c5e 100644
--- a/src/gui/gui-nick.c
+++ b/src/gui/gui-nick.c
@@ -28,10 +28,10 @@
 #include <string.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "gui-nick.h"
 #include "gui-color.h"
 
diff --git a/src/gui/gui-nicklist.c b/src/gui/gui-nicklist.c
index 3050cdd7b..404cf0e86 100644
--- a/src/gui/gui-nicklist.c
+++ b/src/gui/gui-nicklist.c
@@ -34,14 +34,14 @@
 #include <ctype.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-nicklist.h"
 #include "gui-buffer.h"
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 1680cccf4..af5f80e07 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -34,13 +34,13 @@
 #include <ctype.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
-#include "../core/wee-utf8.h"
+#include "../core/core-config.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
+#include "../core/core-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-window.h"
 #include "gui-bar.h"
diff --git a/src/plugins/plugin-api-info.c b/src/plugins/plugin-api-info.c
index f22515847..870c9caae 100644
--- a/src/plugins/plugin-api-info.c
+++ b/src/plugins/plugin-api-info.c
@@ -30,17 +30,17 @@
 #include <time.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-crypto.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-proxy.h"
-#include "../core/wee-secure.h"
-#include "../core/wee-string.h"
-#include "../core/wee-url.h"
-#include "../core/wee-util.h"
-#include "../core/wee-version.h"
+#include "../core/core-config.h"
+#include "../core/core-crypto.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-proxy.h"
+#include "../core/core-secure.h"
+#include "../core/core-string.h"
+#include "../core/core-url.h"
+#include "../core/core-util.h"
+#include "../core/core-version.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-bar-window.h"
diff --git a/src/plugins/plugin-api.c b/src/plugins/plugin-api.c
index 9f1797874..801a17591 100644
--- a/src/plugins/plugin-api.c
+++ b/src/plugins/plugin-api.c
@@ -28,14 +28,14 @@
 #include <gcrypt.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-crypto.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-input.h"
-#include "../core/wee-proxy.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-crypto.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-input.h"
+#include "../core/core-proxy.h"
+#include "../core/core-string.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-bar-window.h"
diff --git a/src/plugins/plugin-config.c b/src/plugins/plugin-config.c
index a893d3c6f..f8b2b8e17 100644
--- a/src/plugins/plugin-config.c
+++ b/src/plugins/plugin-config.c
@@ -30,11 +30,11 @@
 #include <sys/stat.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-config.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-list.h"
-#include "../core/wee-log.h"
-#include "../core/wee-string.h"
+#include "../core/core-config.h"
+#include "../core/core-hook.h"
+#include "../core/core-list.h"
+#include "../core/core-log.h"
+#include "../core/core-string.h"
 #include "plugin-config.h"
 #include "weechat-plugin.h"
 
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index 314264c94..c166c8462 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -36,21 +36,21 @@
 #include <dlfcn.h>
 
 #include "../core/weechat.h"
-#include "../core/wee-arraylist.h"
-#include "../core/wee-config.h"
-#include "../core/wee-dir.h"
-#include "../core/wee-eval.h"
-#include "../core/wee-hashtable.h"
-#include "../core/wee-hdata.h"
-#include "../core/wee-hook.h"
-#include "../core/wee-infolist.h"
-#include "../core/wee-list.h"
-#include "../core/wee-log.h"
-#include "../core/wee-network.h"
-#include "../core/wee-string.h"
-#include "../core/wee-upgrade-file.h"
-#include "../core/wee-utf8.h"
-#include "../core/wee-util.h"
+#include "../core/core-arraylist.h"
+#include "../core/core-config.h"
+#include "../core/core-dir.h"
+#include "../core/core-eval.h"
+#include "../core/core-hashtable.h"
+#include "../core/core-hdata.h"
+#include "../core/core-hook.h"
+#include "../core/core-infolist.h"
+#include "../core/core-list.h"
+#include "../core/core-log.h"
+#include "../core/core-network.h"
+#include "../core/core-string.h"
+#include "../core/core-upgrade-file.h"
+#include "../core/core-utf8.h"
+#include "../core/core-util.h"
 #include "../gui/gui-bar.h"
 #include "../gui/gui-bar-item.h"
 #include "../gui/gui-buffer.h"