Changed the Python bindings source directory and updated code.

152 files changed, 306 insertions, 149 deletions

diff --git a/ChangeLog b/ChangeLog
index bd8482a..c0d10ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,162 @@
 18-01-16  Cyrille Bagard <nocbos@gmail.com>
 
+	* configure.ac:
+	* plugins/Makefile.am:
+	* plugins/arm/python/instruction.c:
+	* plugins/arm/python/module.c:
+	* plugins/arm/python/processor.c:
+	* plugins/arm/python/v7/instruction.c:
+	* plugins/arm/python/v7/processor.c:
+	* plugins/dex/python/class.c:
+	* plugins/dex/python/format.c:
+	* plugins/dex/python/module.c:
+	* plugins/elf/python/constants.c:
+	* plugins/elf/python/format.c:
+	* plugins/elf/python/module.c:
+	* plugins/elf/python/translate.c:
+	Update code.
+
+	* plugins/pychrysalide/Makefile.am:
+	* plugins/pychrysalide/access.c:
+	* plugins/pychrysalide/access.h:
+	* plugins/pychrysalide/analysis/Makefile.am:
+	* plugins/pychrysalide/analysis/binary.c:
+	* plugins/pychrysalide/analysis/binary.h:
+	* plugins/pychrysalide/analysis/block.c:
+	* plugins/pychrysalide/analysis/block.h:
+	* plugins/pychrysalide/analysis/content.c:
+	* plugins/pychrysalide/analysis/content.h:
+	* plugins/pychrysalide/analysis/contents/Makefile.am:
+	* plugins/pychrysalide/analysis/contents/file.c:
+	* plugins/pychrysalide/analysis/contents/file.h:
+	* plugins/pychrysalide/analysis/contents/module.c:
+	* plugins/pychrysalide/analysis/contents/module.h:
+	* plugins/pychrysalide/analysis/contents/restricted.c:
+	* plugins/pychrysalide/analysis/contents/restricted.h:
+	* plugins/pychrysalide/analysis/db/Makefile.am:
+	* plugins/pychrysalide/analysis/db/certs.c:
+	* plugins/pychrysalide/analysis/db/certs.h:
+	* plugins/pychrysalide/analysis/db/collection.c:
+	* plugins/pychrysalide/analysis/db/collection.h:
+	* plugins/pychrysalide/analysis/db/item.c:
+	* plugins/pychrysalide/analysis/db/item.h:
+	* plugins/pychrysalide/analysis/db/items/Makefile.am:
+	* plugins/pychrysalide/analysis/db/items/comment.c:
+	* plugins/pychrysalide/analysis/db/items/comment.h:
+	* plugins/pychrysalide/analysis/db/items/module.c:
+	* plugins/pychrysalide/analysis/db/items/module.h:
+	* plugins/pychrysalide/analysis/db/module.c:
+	* plugins/pychrysalide/analysis/db/module.h:
+	* plugins/pychrysalide/analysis/loaded.c:
+	* plugins/pychrysalide/analysis/loaded.h:
+	* plugins/pychrysalide/analysis/module.c:
+	* plugins/pychrysalide/analysis/module.h:
+	* plugins/pychrysalide/analysis/routine.c:
+	* plugins/pychrysalide/analysis/routine.h:
+	* plugins/pychrysalide/arch/Makefile.am:
+	* plugins/pychrysalide/arch/immediate.c:
+	* plugins/pychrysalide/arch/immediate.h:
+	* plugins/pychrysalide/arch/instriter.c:
+	* plugins/pychrysalide/arch/instriter.h:
+	* plugins/pychrysalide/arch/instruction.c:
+	* plugins/pychrysalide/arch/instruction.h:
+	* plugins/pychrysalide/arch/module.c:
+	* plugins/pychrysalide/arch/module.h:
+	* plugins/pychrysalide/arch/operand.c:
+	* plugins/pychrysalide/arch/operand.h:
+	* plugins/pychrysalide/arch/processor.c:
+	* plugins/pychrysalide/arch/processor.h:
+	* plugins/pychrysalide/arch/raw.c:
+	* plugins/pychrysalide/arch/raw.h:
+	* plugins/pychrysalide/arch/vmpa.c:
+	* plugins/pychrysalide/arch/vmpa.h:
+	* plugins/pychrysalide/common/Makefile.am:
+	* plugins/pychrysalide/common/bits.c:
+	* plugins/pychrysalide/common/bits.h:
+	* plugins/pychrysalide/common/fnv1a.c:
+	* plugins/pychrysalide/common/fnv1a.h:
+	* plugins/pychrysalide/common/module.c:
+	* plugins/pychrysalide/common/module.h:
+	* plugins/pychrysalide/common/pathname.c:
+	* plugins/pychrysalide/common/pathname.h:
+	* plugins/pychrysalide/core/Makefile.am:
+	* plugins/pychrysalide/core/formats.c:
+	* plugins/pychrysalide/core/formats.h:
+	* plugins/pychrysalide/core/logs.c:
+	* plugins/pychrysalide/core/logs.h:
+	* plugins/pychrysalide/core/module.c:
+	* plugins/pychrysalide/core/module.h:
+	* plugins/pychrysalide/core/params.c:
+	* plugins/pychrysalide/core/params.h:
+	* plugins/pychrysalide/debug/Makefile.am:
+	* plugins/pychrysalide/debug/debugger.c:
+	* plugins/pychrysalide/debug/debugger.h:
+	* plugins/pychrysalide/debug/gdbrsp/Makefile.am:
+	* plugins/pychrysalide/debug/gdbrsp/gdb.c:
+	* plugins/pychrysalide/debug/gdbrsp/gdb.h:
+	* plugins/pychrysalide/debug/gdbrsp/module.c:
+	* plugins/pychrysalide/debug/gdbrsp/module.h:
+	* plugins/pychrysalide/debug/module.c:
+	* plugins/pychrysalide/debug/module.h:
+	* plugins/pychrysalide/format/Makefile.am:
+	* plugins/pychrysalide/format/executable.c:
+	* plugins/pychrysalide/format/executable.h:
+	* plugins/pychrysalide/format/format.c:
+	* plugins/pychrysalide/format/format.h:
+	* plugins/pychrysalide/format/module.c:
+	* plugins/pychrysalide/format/module.h:
+	* plugins/pychrysalide/format/symbol.c:
+	* plugins/pychrysalide/format/symbol.h:
+	* plugins/pychrysalide/format/symiter.c:
+	* plugins/pychrysalide/format/symiter.h:
+	* plugins/pychrysalide/glibext/Makefile.am:
+	* plugins/pychrysalide/glibext/buffercache.c:
+	* plugins/pychrysalide/glibext/buffercache.h:
+	* plugins/pychrysalide/glibext/bufferline.c:
+	* plugins/pychrysalide/glibext/bufferline.h:
+	* plugins/pychrysalide/glibext/configuration.c:
+	* plugins/pychrysalide/glibext/configuration.h:
+	* plugins/pychrysalide/glibext/linegen.c:
+	* plugins/pychrysalide/glibext/linegen.h:
+	* plugins/pychrysalide/glibext/loadedpanel.c:
+	* plugins/pychrysalide/glibext/loadedpanel.h:
+	* plugins/pychrysalide/glibext/module.c:
+	* plugins/pychrysalide/glibext/module.h:
+	* plugins/pychrysalide/gtkext/Makefile.am:
+	* plugins/pychrysalide/gtkext/blockdisplay.c:
+	* plugins/pychrysalide/gtkext/blockdisplay.h:
+	* plugins/pychrysalide/gtkext/bufferdisplay.c:
+	* plugins/pychrysalide/gtkext/bufferdisplay.h:
+	* plugins/pychrysalide/gtkext/displaypanel.c:
+	* plugins/pychrysalide/gtkext/displaypanel.h:
+	* plugins/pychrysalide/gtkext/dockable.c:
+	* plugins/pychrysalide/gtkext/dockable.h:
+	* plugins/pychrysalide/gtkext/module.c:
+	* plugins/pychrysalide/gtkext/module.h:
+	* plugins/pychrysalide/gui/Makefile.am:
+	* plugins/pychrysalide/gui/editem.c:
+	* plugins/pychrysalide/gui/editem.h:
+	* plugins/pychrysalide/gui/module.c:
+	* plugins/pychrysalide/gui/module.h:
+	* plugins/pychrysalide/gui/panels/Makefile.am:
+	* plugins/pychrysalide/gui/panels/module.c:
+	* plugins/pychrysalide/gui/panels/module.h:
+	* plugins/pychrysalide/gui/panels/panel.c:
+	* plugins/pychrysalide/gui/panels/panel.h:
+	* plugins/pychrysalide/helpers.c:
+	* plugins/pychrysalide/helpers.h:
+	* plugins/pychrysalide/plugin.c:
+	* plugins/pychrysalide/plugin.h:
+	* plugins/pychrysalide/pychrysa.c:
+	* plugins/pychrysalide/pychrysa.h:
+	* plugins/pychrysalide/struct.c:
+	* plugins/pychrysalide/struct.h:
+	* plugins/pychrysalide/weak.c:
+	* plugins/pychrysalide/weak.h:
+	Change the Python bindings source directory and update code.
+
+18-01-16  Cyrille Bagard <nocbos@gmail.com>
+
 	* plugins/pychrysa/format/format.c:
 	Add and remove symbols from the Python API.
 
diff --git a/configure.ac b/configure.ac
index 902a5a0..b6d2fdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,21 +339,21 @@ AC_CONFIG_FILES([Makefile
                  plugins/fmtp/Makefile
                  plugins/libcsem/Makefile
                  plugins/mobicore/Makefile
-                 plugins/pychrysa/Makefile
-                 plugins/pychrysa/analysis/Makefile
-                 plugins/pychrysa/analysis/contents/Makefile
-                 plugins/pychrysa/analysis/db/Makefile
-                 plugins/pychrysa/analysis/db/items/Makefile
-                 plugins/pychrysa/arch/Makefile
-                 plugins/pychrysa/common/Makefile
-                 plugins/pychrysa/core/Makefile
-                 plugins/pychrysa/debug/Makefile
-                 plugins/pychrysa/debug/gdbrsp/Makefile
-                 plugins/pychrysa/format/Makefile
-                 plugins/pychrysa/glibext/Makefile
-                 plugins/pychrysa/gtkext/Makefile
-                 plugins/pychrysa/gui/Makefile
-                 plugins/pychrysa/gui/panels/Makefile
+                 plugins/pychrysalide/Makefile
+                 plugins/pychrysalide/analysis/Makefile
+                 plugins/pychrysalide/analysis/contents/Makefile
+                 plugins/pychrysalide/analysis/db/Makefile
+                 plugins/pychrysalide/analysis/db/items/Makefile
+                 plugins/pychrysalide/arch/Makefile
+                 plugins/pychrysalide/common/Makefile
+                 plugins/pychrysalide/core/Makefile
+                 plugins/pychrysalide/debug/Makefile
+                 plugins/pychrysalide/debug/gdbrsp/Makefile
+                 plugins/pychrysalide/format/Makefile
+                 plugins/pychrysalide/glibext/Makefile
+                 plugins/pychrysalide/gtkext/Makefile
+                 plugins/pychrysalide/gui/Makefile
+                 plugins/pychrysalide/gui/panels/Makefile
                  plugins/python/Makefile
                  plugins/python/apkfiles/Makefile
                  plugins/python/samples/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9f26d8f..6bb44fa 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 
 if HAVE_PYTHON3_CONFIG
-    PYTHON3_SUBDIRS = pychrysa python
+    PYTHON3_SUBDIRS = pychrysalide python
 endif
 
 # androhelpers
diff --git a/plugins/arm/python/instruction.c b/plugins/arm/python/instruction.c
index bbcde50..f88e998 100644
--- a/plugins/arm/python/instruction.c
+++ b/plugins/arm/python/instruction.c
@@ -28,8 +28,8 @@
 #include <pygobject.h>
 
 
-#include <plugins/pychrysa/helpers.h>
-#include <plugins/pychrysa/arch/instruction.h>
+#include <plugins/pychrysalide/helpers.h>
+#include <plugins/pychrysalide/arch/instruction.h>
 
 
 #include "../instruction.h"
diff --git a/plugins/arm/python/module.c b/plugins/arm/python/module.c
index 6d71afe..9e832ba 100644
--- a/plugins/arm/python/module.c
+++ b/plugins/arm/python/module.c
@@ -28,7 +28,7 @@
 #include <Python.h>
 
 
-#include <plugins/pychrysa/access.h>
+#include <plugins/pychrysalide/access.h>
 
 
 #include "instruction.h"
diff --git a/plugins/arm/python/processor.c b/plugins/arm/python/processor.c
index 818809d..9be96ad 100644
--- a/plugins/arm/python/processor.c
+++ b/plugins/arm/python/processor.c
@@ -28,8 +28,8 @@
 #include <pygobject.h>
 
 
-#include <plugins/pychrysa/helpers.h>
-#include <plugins/pychrysa/arch/processor.h>
+#include <plugins/pychrysalide/helpers.h>
+#include <plugins/pychrysalide/arch/processor.h>
 
 
 #include "../processor.h"
diff --git a/plugins/arm/python/v7/instruction.c b/plugins/arm/python/v7/instruction.c
index 25a49bb..127840f 100644
--- a/plugins/arm/python/v7/instruction.c
+++ b/plugins/arm/python/v7/instruction.c
@@ -28,7 +28,7 @@
 #include <pygobject.h>
 
 
-#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysalide/helpers.h>
 
 
 #include "../instruction.h"
diff --git a/plugins/arm/python/v7/processor.c b/plugins/arm/python/v7/processor.c
index 9a0911c..b624f7f 100644
--- a/plugins/arm/python/v7/processor.c
+++ b/plugins/arm/python/v7/processor.c
@@ -28,7 +28,7 @@
 #include <pygobject.h>
 
 
-#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysalide/helpers.h>
 
 
 #include "../processor.h"
diff --git a/plugins/dex/python/class.c b/plugins/dex/python/class.c
index ec1c3f7..ab7754e 100644
--- a/plugins/dex/python/class.c
+++ b/plugins/dex/python/class.c
@@ -28,7 +28,7 @@
 #include <pygobject.h>
 
 
-#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysalide/helpers.h>
 
 
 #include "../class.h"
diff --git a/plugins/dex/python/format.c b/plugins/dex/python/format.c
index 906b09a..a406f62 100644
--- a/plugins/dex/python/format.c
+++ b/plugins/dex/python/format.c
@@ -29,10 +29,10 @@
 
 
 #include <i18n.h>
-#include <plugins/pychrysa/helpers.h>
-#include <plugins/pychrysa/analysis/binary.h>
-#include <plugins/pychrysa/analysis/content.h>
-#include <plugins/pychrysa/format/executable.h>
+#include <plugins/pychrysalide/helpers.h>
+#include <plugins/pychrysalide/analysis/binary.h>
+#include <plugins/pychrysalide/analysis/content.h>
+#include <plugins/pychrysalide/format/executable.h>
 
 
 #include "../class.h"
diff --git a/plugins/dex/python/module.c b/plugins/dex/python/module.c
index 8d5092d..acb2370 100644
--- a/plugins/dex/python/module.c
+++ b/plugins/dex/python/module.c
@@ -28,7 +28,7 @@
 #include <Python.h>
 
 
-#include <plugins/pychrysa/access.h>
+#include <plugins/pychrysalide/access.h>
 
 
 #include "class.h"
diff --git a/plugins/elf/python/constants.c b/plugins/elf/python/constants.c
index 91c07ee..1e92616 100644
--- a/plugins/elf/python/constants.c
+++ b/plugins/elf/python/constants.c
@@ -25,7 +25,7 @@
 #include "constants.h"
 
 
-#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysalide/helpers.h>
 
 
 #include "../elf_def.h"
diff --git a/plugins/elf/python/format.c b/plugins/elf/python/format.c
index f1cf8d6..6b44703 100644
--- a/plugins/elf/python/format.c
+++ b/plugins/elf/python/format.c
@@ -31,9 +31,9 @@
 #include <i18n.h>
 #include <format/executable.h>
 #include <analysis/content.h>
-#include <plugins/pychrysa/helpers.h>
-#include <plugins/pychrysa/analysis/content.h>
-#include <plugins/pychrysa/format/executable.h>
+#include <plugins/pychrysalide/helpers.h>
+#include <plugins/pychrysalide/analysis/content.h>
+#include <plugins/pychrysalide/format/executable.h>
 
 
 #include "constants.h"
diff --git a/plugins/elf/python/module.c b/plugins/elf/python/module.c
index 72d6dfc..f986659 100644
--- a/plugins/elf/python/module.c
+++ b/plugins/elf/python/module.c
@@ -28,7 +28,7 @@
 #include <Python.h>
 
 
-#include <plugins/pychrysa/access.h>
+#include <plugins/pychrysalide/access.h>
 
 
 #include "format.h"
diff --git a/plugins/elf/python/translate.c b/plugins/elf/python/translate.c
index 2450e1a..2a12220 100644
--- a/plugins/elf/python/translate.c
+++ b/plugins/elf/python/translate.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 
 
-#include <plugins/pychrysa/struct.h>
+#include <plugins/pychrysalide/struct.h>
 
 
 #include "../elf-int.h"
diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysalide/Makefile.am
index 0648bb3..0648bb3 100644
--- a/plugins/pychrysa/Makefile.am
+++ b/plugins/pychrysalide/Makefile.am
diff --git a/plugins/pychrysa/access.c b/plugins/pychrysalide/access.c
index 21ff68f..21ff68f 100644
--- a/plugins/pychrysa/access.c
+++ b/plugins/pychrysalide/access.c
diff --git a/plugins/pychrysa/access.h b/plugins/pychrysalide/access.h
index 52883ec..f5d47ce 100644
--- a/plugins/pychrysa/access.h
+++ b/plugins/pychrysalide/access.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ACCESS_H
-#define _PLUGINS_PYCHRYSA_ACCESS_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ACCESS_H
+#define _PLUGINS_PYCHRYSALIDE_ACCESS_H
 
 
 #include <Python.h>
@@ -37,4 +37,4 @@ PyObject *get_access_to_python_module(const char *path);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ACCESS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ACCESS_H */
diff --git a/plugins/pychrysa/analysis/Makefile.am b/plugins/pychrysalide/analysis/Makefile.am
index c1639e7..c1639e7 100644
--- a/plugins/pychrysa/analysis/Makefile.am
+++ b/plugins/pychrysalide/analysis/Makefile.am
diff --git a/plugins/pychrysa/analysis/binary.c b/plugins/pychrysalide/analysis/binary.c
index 6be767c..6be767c 100644
--- a/plugins/pychrysa/analysis/binary.c
+++ b/plugins/pychrysalide/analysis/binary.c
diff --git a/plugins/pychrysa/analysis/binary.h b/plugins/pychrysalide/analysis/binary.h
index d134111..d134111 100644
--- a/plugins/pychrysa/analysis/binary.h
+++ b/plugins/pychrysalide/analysis/binary.h
diff --git a/plugins/pychrysa/analysis/block.c b/plugins/pychrysalide/analysis/block.c
index edd364d..edd364d 100644
--- a/plugins/pychrysa/analysis/block.c
+++ b/plugins/pychrysalide/analysis/block.c
diff --git a/plugins/pychrysa/analysis/block.h b/plugins/pychrysalide/analysis/block.h
index 1f87445..1f87445 100644
--- a/plugins/pychrysa/analysis/block.h
+++ b/plugins/pychrysalide/analysis/block.h
diff --git a/plugins/pychrysa/analysis/content.c b/plugins/pychrysalide/analysis/content.c
index 1f36eb8..1f36eb8 100644
--- a/plugins/pychrysa/analysis/content.c
+++ b/plugins/pychrysalide/analysis/content.c
diff --git a/plugins/pychrysa/analysis/content.h b/plugins/pychrysalide/analysis/content.h
index da1b9be..71d8100 100644
--- a/plugins/pychrysa/analysis/content.h
+++ b/plugins/pychrysalide/analysis/content.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_CONTENT_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENT_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENT_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENT_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_binary_content(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENT_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENT_H */
diff --git a/plugins/pychrysa/analysis/contents/Makefile.am b/plugins/pychrysalide/analysis/contents/Makefile.am
index 3cd00a6..3cd00a6 100644
--- a/plugins/pychrysa/analysis/contents/Makefile.am
+++ b/plugins/pychrysalide/analysis/contents/Makefile.am
diff --git a/plugins/pychrysa/analysis/contents/file.c b/plugins/pychrysalide/analysis/contents/file.c
index b033611..b033611 100644
--- a/plugins/pychrysa/analysis/contents/file.c
+++ b/plugins/pychrysalide/analysis/contents/file.c
diff --git a/plugins/pychrysa/analysis/contents/file.h b/plugins/pychrysalide/analysis/contents/file.h
index 25e11dc..04f4395 100644
--- a/plugins/pychrysa/analysis/contents/file.h
+++ b/plugins/pychrysalide/analysis/contents/file.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_FILE_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_FILE_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_file_content(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_FILE_H */
diff --git a/plugins/pychrysa/analysis/contents/module.c b/plugins/pychrysalide/analysis/contents/module.c
index 2daa62c..2daa62c 100644
--- a/plugins/pychrysa/analysis/contents/module.c
+++ b/plugins/pychrysalide/analysis/contents/module.c
diff --git a/plugins/pychrysa/analysis/contents/module.h b/plugins/pychrysalide/analysis/contents/module.h
index 1b6adfa..1b6adfa 100644
--- a/plugins/pychrysa/analysis/contents/module.h
+++ b/plugins/pychrysalide/analysis/contents/module.h
diff --git a/plugins/pychrysa/analysis/contents/restricted.c b/plugins/pychrysalide/analysis/contents/restricted.c
index f8b0b98..f8b0b98 100644
--- a/plugins/pychrysa/analysis/contents/restricted.c
+++ b/plugins/pychrysalide/analysis/contents/restricted.c
diff --git a/plugins/pychrysa/analysis/contents/restricted.h b/plugins/pychrysalide/analysis/contents/restricted.h
index baf4bb2..5b7b910 100644
--- a/plugins/pychrysa/analysis/contents/restricted.h
+++ b/plugins/pychrysalide/analysis/contents/restricted.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_RESTRICTED_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_RESTRICTED_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_restricted_content(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENTS_RESTRICTED_H */
diff --git a/plugins/pychrysa/analysis/db/Makefile.am b/plugins/pychrysalide/analysis/db/Makefile.am
index a6bb701..a6bb701 100644
--- a/plugins/pychrysa/analysis/db/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/Makefile.am
diff --git a/plugins/pychrysa/analysis/db/certs.c b/plugins/pychrysalide/analysis/db/certs.c
index e0358d1..e0358d1 100644
--- a/plugins/pychrysa/analysis/db/certs.c
+++ b/plugins/pychrysalide/analysis/db/certs.c
diff --git a/plugins/pychrysa/analysis/db/certs.h b/plugins/pychrysalide/analysis/db/certs.h
index f7537e5..2e90778 100644
--- a/plugins/pychrysa/analysis/db/certs.h
+++ b/plugins/pychrysalide/analysis/db/certs.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_CERTS_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_CERTS_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_CERTS_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_CERTS_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_certs(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_CERTSS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_CERTSS_H */
diff --git a/plugins/pychrysa/analysis/db/collection.c b/plugins/pychrysalide/analysis/db/collection.c
index 80fcfc2..80fcfc2 100644
--- a/plugins/pychrysa/analysis/db/collection.c
+++ b/plugins/pychrysalide/analysis/db/collection.c
diff --git a/plugins/pychrysa/analysis/db/collection.h b/plugins/pychrysalide/analysis/db/collection.h
index 2f2d1dd..76256bc 100644
--- a/plugins/pychrysa/analysis/db/collection.h
+++ b/plugins/pychrysalide/analysis/db/collection.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_COLLECTION_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_COLLECTION_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_COLLECTION_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_COLLECTION_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_db_collection(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_COLLECTIONS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_COLLECTIONS_H */
diff --git a/plugins/pychrysa/analysis/db/item.c b/plugins/pychrysalide/analysis/db/item.c
index 27b5bac..27b5bac 100644
--- a/plugins/pychrysa/analysis/db/item.c
+++ b/plugins/pychrysalide/analysis/db/item.c
diff --git a/plugins/pychrysa/analysis/db/item.h b/plugins/pychrysalide/analysis/db/item.h
index cfbe48a..96122e6 100644
--- a/plugins/pychrysa/analysis/db/item.h
+++ b/plugins/pychrysalide/analysis/db/item.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEM_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEM_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEM_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEM_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_db_item(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEM_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEM_H */
diff --git a/plugins/pychrysa/analysis/db/items/Makefile.am b/plugins/pychrysalide/analysis/db/items/Makefile.am
index b08a558..b08a558 100644
--- a/plugins/pychrysa/analysis/db/items/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/items/Makefile.am
diff --git a/plugins/pychrysa/analysis/db/items/comment.c b/plugins/pychrysalide/analysis/db/items/comment.c
index 28886f5..28886f5 100644
--- a/plugins/pychrysa/analysis/db/items/comment.c
+++ b/plugins/pychrysalide/analysis/db/items/comment.c
diff --git a/plugins/pychrysa/analysis/db/items/comment.h b/plugins/pychrysalide/analysis/db/items/comment.h
index bf74ad0..2b4f130 100644
--- a/plugins/pychrysa/analysis/db/items/comment.h
+++ b/plugins/pychrysalide/analysis/db/items/comment.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_COMMENT_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_COMMENT_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_COMMENT_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_COMMENT_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_db_comment(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_COMMENT_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_COMMENT_H */
diff --git a/plugins/pychrysa/analysis/db/items/module.c b/plugins/pychrysalide/analysis/db/items/module.c
index cf0fe56..cf0fe56 100644
--- a/plugins/pychrysa/analysis/db/items/module.c
+++ b/plugins/pychrysalide/analysis/db/items/module.c
diff --git a/plugins/pychrysa/analysis/db/items/module.h b/plugins/pychrysalide/analysis/db/items/module.h
index 12d9f43..1382226 100644
--- a/plugins/pychrysa/analysis/db/items/module.h
+++ b/plugins/pychrysalide/analysis/db/items/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_MODULE_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_analysis_db_items_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_ITEMS_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_ITEMS_MODULE_H */
diff --git a/plugins/pychrysa/analysis/db/module.c b/plugins/pychrysalide/analysis/db/module.c
index 1c4da25..1c4da25 100644
--- a/plugins/pychrysa/analysis/db/module.c
+++ b/plugins/pychrysalide/analysis/db/module.c
diff --git a/plugins/pychrysa/analysis/db/module.h b/plugins/pychrysalide/analysis/db/module.h
index 9adeb20..d545ecb 100644
--- a/plugins/pychrysa/analysis/db/module.h
+++ b/plugins/pychrysalide/analysis/db/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_DB_MODULE_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_DB_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_analysis_db_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_DB_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_DB_MODULE_H */
diff --git a/plugins/pychrysa/analysis/loaded.c b/plugins/pychrysalide/analysis/loaded.c
index b38025a..b38025a 100644
--- a/plugins/pychrysa/analysis/loaded.c
+++ b/plugins/pychrysalide/analysis/loaded.c
diff --git a/plugins/pychrysa/analysis/loaded.h b/plugins/pychrysalide/analysis/loaded.h
index 3238202..8f9478b 100644
--- a/plugins/pychrysa/analysis/loaded.h
+++ b/plugins/pychrysalide/analysis/loaded.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_LOADED_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_LOADED_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ANALYSIS_LOADED_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_LOADED_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_loaded_content(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENT_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_CONTENT_H */
diff --git a/plugins/pychrysa/analysis/module.c b/plugins/pychrysalide/analysis/module.c
index f4a0f5b..f4a0f5b 100644
--- a/plugins/pychrysa/analysis/module.c
+++ b/plugins/pychrysalide/analysis/module.c
diff --git a/plugins/pychrysa/analysis/module.h b/plugins/pychrysalide/analysis/module.h
index 310fc0c..310fc0c 100644
--- a/plugins/pychrysa/analysis/module.h
+++ b/plugins/pychrysalide/analysis/module.h
diff --git a/plugins/pychrysa/analysis/routine.c b/plugins/pychrysalide/analysis/routine.c
index 37f36a7..37f36a7 100644
--- a/plugins/pychrysa/analysis/routine.c
+++ b/plugins/pychrysalide/analysis/routine.c
diff --git a/plugins/pychrysa/analysis/routine.h b/plugins/pychrysalide/analysis/routine.h
index 57ad7bc..57ad7bc 100644
--- a/plugins/pychrysa/analysis/routine.h
+++ b/plugins/pychrysalide/analysis/routine.h
diff --git a/plugins/pychrysa/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index 694c9e0..694c9e0 100644
--- a/plugins/pychrysa/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
diff --git a/plugins/pychrysa/arch/immediate.c b/plugins/pychrysalide/arch/immediate.c
index f1ec125..f1ec125 100644
--- a/plugins/pychrysa/arch/immediate.c
+++ b/plugins/pychrysalide/arch/immediate.c
diff --git a/plugins/pychrysa/arch/immediate.h b/plugins/pychrysalide/arch/immediate.h
index d6e5eba..d6e5eba 100644
--- a/plugins/pychrysa/arch/immediate.h
+++ b/plugins/pychrysalide/arch/immediate.h
diff --git a/plugins/pychrysa/arch/instriter.c b/plugins/pychrysalide/arch/instriter.c
index 244a825..244a825 100644
--- a/plugins/pychrysa/arch/instriter.c
+++ b/plugins/pychrysalide/arch/instriter.c
diff --git a/plugins/pychrysa/arch/instriter.h b/plugins/pychrysalide/arch/instriter.h
index 3cb0e38..3cb0e38 100644
--- a/plugins/pychrysa/arch/instriter.h
+++ b/plugins/pychrysalide/arch/instriter.h
diff --git a/plugins/pychrysa/arch/instruction.c b/plugins/pychrysalide/arch/instruction.c
index bb977ce..bb977ce 100644
--- a/plugins/pychrysa/arch/instruction.c
+++ b/plugins/pychrysalide/arch/instruction.c
diff --git a/plugins/pychrysa/arch/instruction.h b/plugins/pychrysalide/arch/instruction.h
index 85a1552..85a1552 100644
--- a/plugins/pychrysa/arch/instruction.h
+++ b/plugins/pychrysalide/arch/instruction.h
diff --git a/plugins/pychrysa/arch/module.c b/plugins/pychrysalide/arch/module.c
index 54b470c..54b470c 100644
--- a/plugins/pychrysa/arch/module.c
+++ b/plugins/pychrysalide/arch/module.c
diff --git a/plugins/pychrysa/arch/module.h b/plugins/pychrysalide/arch/module.h
index 07d3575..07d3575 100644
--- a/plugins/pychrysa/arch/module.h
+++ b/plugins/pychrysalide/arch/module.h
diff --git a/plugins/pychrysa/arch/operand.c b/plugins/pychrysalide/arch/operand.c
index 427f92b..427f92b 100644
--- a/plugins/pychrysa/arch/operand.c
+++ b/plugins/pychrysalide/arch/operand.c
diff --git a/plugins/pychrysa/arch/operand.h b/plugins/pychrysalide/arch/operand.h
index 3c5ef6a..3c5ef6a 100644
--- a/plugins/pychrysa/arch/operand.h
+++ b/plugins/pychrysalide/arch/operand.h
diff --git a/plugins/pychrysa/arch/processor.c b/plugins/pychrysalide/arch/processor.c
index 65431af..65431af 100644
--- a/plugins/pychrysa/arch/processor.c
+++ b/plugins/pychrysalide/arch/processor.c
diff --git a/plugins/pychrysa/arch/processor.h b/plugins/pychrysalide/arch/processor.h
index ff6ccb3..ff6ccb3 100644
--- a/plugins/pychrysa/arch/processor.h
+++ b/plugins/pychrysalide/arch/processor.h
diff --git a/plugins/pychrysa/arch/raw.c b/plugins/pychrysalide/arch/raw.c
index 39b5fe7..39b5fe7 100644
--- a/plugins/pychrysa/arch/raw.c
+++ b/plugins/pychrysalide/arch/raw.c
diff --git a/plugins/pychrysa/arch/raw.h b/plugins/pychrysalide/arch/raw.h
index 4c1db7a..32c4e2d 100644
--- a/plugins/pychrysa/arch/raw.h
+++ b/plugins/pychrysalide/arch/raw.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_ARCH_RAW_H
-#define _PLUGINS_PYCHRYSA_ARCH_RAW_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H
+#define _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_raw_instruction(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_ARCH_RAW_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H */
diff --git a/plugins/pychrysa/arch/vmpa.c b/plugins/pychrysalide/arch/vmpa.c
index 413d67b..413d67b 100644
--- a/plugins/pychrysa/arch/vmpa.c
+++ b/plugins/pychrysalide/arch/vmpa.c
diff --git a/plugins/pychrysa/arch/vmpa.h b/plugins/pychrysalide/arch/vmpa.h
index 46828f5..46828f5 100644
--- a/plugins/pychrysa/arch/vmpa.h
+++ b/plugins/pychrysalide/arch/vmpa.h
diff --git a/plugins/pychrysa/common/Makefile.am b/plugins/pychrysalide/common/Makefile.am
index 0637229..0637229 100644
--- a/plugins/pychrysa/common/Makefile.am
+++ b/plugins/pychrysalide/common/Makefile.am
diff --git a/plugins/pychrysa/common/bits.c b/plugins/pychrysalide/common/bits.c
index 33f81c3..33f81c3 100644
--- a/plugins/pychrysa/common/bits.c
+++ b/plugins/pychrysalide/common/bits.c
diff --git a/plugins/pychrysa/common/bits.h b/plugins/pychrysalide/common/bits.h
index 41465ce..3e2af73 100644
--- a/plugins/pychrysa/common/bits.h
+++ b/plugins/pychrysalide/common/bits.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_COMMON_BITS_H
-#define _PLUGINS_PYCHRYSA_COMMON_BITS_H
+#ifndef _PLUGINS_PYCHRYSALIDE_COMMON_BITS_H
+#define _PLUGINS_PYCHRYSALIDE_COMMON_BITS_H
 
 
 #include <Python.h>
@@ -45,4 +45,4 @@ PyObject *build_from_internal_bitfield(const bitfield_t *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_COMMON_BITS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_COMMON_BITS_H */
diff --git a/plugins/pychrysa/common/fnv1a.c b/plugins/pychrysalide/common/fnv1a.c
index cc2c342..cc2c342 100644
--- a/plugins/pychrysa/common/fnv1a.c
+++ b/plugins/pychrysalide/common/fnv1a.c
diff --git a/plugins/pychrysa/common/fnv1a.h b/plugins/pychrysalide/common/fnv1a.h
index 0a40770..0a40770 100644
--- a/plugins/pychrysa/common/fnv1a.h
+++ b/plugins/pychrysalide/common/fnv1a.h
diff --git a/plugins/pychrysa/common/module.c b/plugins/pychrysalide/common/module.c
index 7ff7528..7ff7528 100644
--- a/plugins/pychrysa/common/module.c
+++ b/plugins/pychrysalide/common/module.c
diff --git a/plugins/pychrysa/common/module.h b/plugins/pychrysalide/common/module.h
index 446f6fe..446f6fe 100644
--- a/plugins/pychrysa/common/module.h
+++ b/plugins/pychrysalide/common/module.h
diff --git a/plugins/pychrysa/common/pathname.c b/plugins/pychrysalide/common/pathname.c
index 40977df..40977df 100644
--- a/plugins/pychrysa/common/pathname.c
+++ b/plugins/pychrysalide/common/pathname.c
diff --git a/plugins/pychrysa/common/pathname.h b/plugins/pychrysalide/common/pathname.h
index a3940c9..a3940c9 100644
--- a/plugins/pychrysa/common/pathname.h
+++ b/plugins/pychrysalide/common/pathname.h
diff --git a/plugins/pychrysa/core/Makefile.am b/plugins/pychrysalide/core/Makefile.am
index 71abfa4..71abfa4 100644
--- a/plugins/pychrysa/core/Makefile.am
+++ b/plugins/pychrysalide/core/Makefile.am
diff --git a/plugins/pychrysa/core/formats.c b/plugins/pychrysalide/core/formats.c
index 621277a..621277a 100644
--- a/plugins/pychrysa/core/formats.c
+++ b/plugins/pychrysalide/core/formats.c
diff --git a/plugins/pychrysa/core/formats.h b/plugins/pychrysalide/core/formats.h
index ca12c3e..ca12c3e 100644
--- a/plugins/pychrysa/core/formats.h
+++ b/plugins/pychrysalide/core/formats.h
diff --git a/plugins/pychrysa/core/logs.c b/plugins/pychrysalide/core/logs.c
index 8a922c1..8a922c1 100644
--- a/plugins/pychrysa/core/logs.c
+++ b/plugins/pychrysalide/core/logs.c
diff --git a/plugins/pychrysa/core/logs.h b/plugins/pychrysalide/core/logs.h
index f1c7faf..a43d9ca 100644
--- a/plugins/pychrysa/core/logs.h
+++ b/plugins/pychrysalide/core/logs.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_CORE_LOGS_H
-#define _PLUGINS_PYCHRYSA_CORE_LOGS_H
+#ifndef _PLUGINS_PYCHRYSALIDE_CORE_LOGS_H
+#define _PLUGINS_PYCHRYSALIDE_CORE_LOGS_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_logs(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_CORE_LOGS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_CORE_LOGS_H */
diff --git a/plugins/pychrysa/core/module.c b/plugins/pychrysalide/core/module.c
index ff7f828..ff7f828 100644
--- a/plugins/pychrysa/core/module.c
+++ b/plugins/pychrysalide/core/module.c
diff --git a/plugins/pychrysa/core/module.h b/plugins/pychrysalide/core/module.h
index 8581425..8581425 100644
--- a/plugins/pychrysa/core/module.h
+++ b/plugins/pychrysalide/core/module.h
diff --git a/plugins/pychrysa/core/params.c b/plugins/pychrysalide/core/params.c
index df71a88..df71a88 100644
--- a/plugins/pychrysa/core/params.c
+++ b/plugins/pychrysalide/core/params.c
diff --git a/plugins/pychrysa/core/params.h b/plugins/pychrysalide/core/params.h
index e7297b3..e7297b3 100644
--- a/plugins/pychrysa/core/params.h
+++ b/plugins/pychrysalide/core/params.h
diff --git a/plugins/pychrysa/debug/Makefile.am b/plugins/pychrysalide/debug/Makefile.am
index 8011c49..8011c49 100644
--- a/plugins/pychrysa/debug/Makefile.am
+++ b/plugins/pychrysalide/debug/Makefile.am
diff --git a/plugins/pychrysa/debug/debugger.c b/plugins/pychrysalide/debug/debugger.c
index 20b94c7..20b94c7 100644
--- a/plugins/pychrysa/debug/debugger.c
+++ b/plugins/pychrysalide/debug/debugger.c
diff --git a/plugins/pychrysa/debug/debugger.h b/plugins/pychrysalide/debug/debugger.h
index 97f91ac..97f91ac 100644
--- a/plugins/pychrysa/debug/debugger.h
+++ b/plugins/pychrysalide/debug/debugger.h
diff --git a/plugins/pychrysa/debug/gdbrsp/Makefile.am b/plugins/pychrysalide/debug/gdbrsp/Makefile.am
index cf7b78a..cf7b78a 100644
--- a/plugins/pychrysa/debug/gdbrsp/Makefile.am
+++ b/plugins/pychrysalide/debug/gdbrsp/Makefile.am
diff --git a/plugins/pychrysa/debug/gdbrsp/gdb.c b/plugins/pychrysalide/debug/gdbrsp/gdb.c
index a4cde20..a4cde20 100644
--- a/plugins/pychrysa/debug/gdbrsp/gdb.c
+++ b/plugins/pychrysalide/debug/gdbrsp/gdb.c
diff --git a/plugins/pychrysa/debug/gdbrsp/gdb.h b/plugins/pychrysalide/debug/gdbrsp/gdb.h
index c3d1330..00afab5 100644
--- a/plugins/pychrysa/debug/gdbrsp/gdb.h
+++ b/plugins/pychrysalide/debug/gdbrsp/gdb.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_DEBUGGER_H
-#define _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_DEBUGGER_H
+#ifndef _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_DEBUGGER_H
+#define _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_DEBUGGER_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_gdb_debugger(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_DEBUGGER_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_DEBUGGER_H */
diff --git a/plugins/pychrysa/debug/gdbrsp/module.c b/plugins/pychrysalide/debug/gdbrsp/module.c
index 6e7896c..6e7896c 100644
--- a/plugins/pychrysa/debug/gdbrsp/module.c
+++ b/plugins/pychrysalide/debug/gdbrsp/module.c
diff --git a/plugins/pychrysa/debug/gdbrsp/module.h b/plugins/pychrysalide/debug/gdbrsp/module.h
index 78e62b0..edc2b11 100644
--- a/plugins/pychrysa/debug/gdbrsp/module.h
+++ b/plugins/pychrysalide/debug/gdbrsp/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_MODULE_H
-#define _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_debug_gdbrsp_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_DEBUG_GDBRSP_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_DEBUG_GDBRSP_MODULE_H */
diff --git a/plugins/pychrysa/debug/module.c b/plugins/pychrysalide/debug/module.c
index ea586be..ea586be 100644
--- a/plugins/pychrysa/debug/module.c
+++ b/plugins/pychrysalide/debug/module.c
diff --git a/plugins/pychrysa/debug/module.h b/plugins/pychrysalide/debug/module.h
index bbd1971..b723ab8 100644
--- a/plugins/pychrysa/debug/module.h
+++ b/plugins/pychrysalide/debug/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_DEBUG_MODULE_H
-#define _PLUGINS_PYCHRYSA_DEBUG_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_DEBUG_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_DEBUG_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_debug_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_DEBUG_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_DEBUG_MODULE_H */
diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysalide/format/Makefile.am
index 325206c..325206c 100644
--- a/plugins/pychrysa/format/Makefile.am
+++ b/plugins/pychrysalide/format/Makefile.am
diff --git a/plugins/pychrysa/format/executable.c b/plugins/pychrysalide/format/executable.c
index 1b1bfe8..1b1bfe8 100644
--- a/plugins/pychrysa/format/executable.c
+++ b/plugins/pychrysalide/format/executable.c
diff --git a/plugins/pychrysa/format/executable.h b/plugins/pychrysalide/format/executable.h
index cfb633f..2157b93 100644
--- a/plugins/pychrysa/format/executable.h
+++ b/plugins/pychrysalide/format/executable.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_EXECUTABLE_H
-#define _PLUGINS_PYCHRYSA_FORMAT_EXECUTABLE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_FORMAT_EXECUTABLE_H
+#define _PLUGINS_PYCHRYSALIDE_FORMAT_EXECUTABLE_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_executable_format(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_EXECUTABLE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_FORMAT_EXECUTABLE_H */
diff --git a/plugins/pychrysa/format/format.c b/plugins/pychrysalide/format/format.c
index 3bfc705..3bfc705 100644
--- a/plugins/pychrysa/format/format.c
+++ b/plugins/pychrysalide/format/format.c
diff --git a/plugins/pychrysa/format/format.h b/plugins/pychrysalide/format/format.h
index 08f9e6b..a8dfbf0 100644
--- a/plugins/pychrysa/format/format.h
+++ b/plugins/pychrysalide/format/format.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_FORMAT_H
-#define _PLUGINS_PYCHRYSA_FORMAT_FORMAT_H
+#ifndef _PLUGINS_PYCHRYSALIDE_FORMAT_FORMAT_H
+#define _PLUGINS_PYCHRYSALIDE_FORMAT_FORMAT_H
 
 
 #include <Python.h>
@@ -53,4 +53,4 @@ bool register_python_binary_format(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_FORMAT_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_FORMAT_FORMAT_H */
diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysalide/format/module.c
index 1daeb3f..1daeb3f 100644
--- a/plugins/pychrysa/format/module.c
+++ b/plugins/pychrysalide/format/module.c
diff --git a/plugins/pychrysa/format/module.h b/plugins/pychrysalide/format/module.h
index 0557722..0557722 100644
--- a/plugins/pychrysa/format/module.h
+++ b/plugins/pychrysalide/format/module.h
diff --git a/plugins/pychrysa/format/symbol.c b/plugins/pychrysalide/format/symbol.c
index 5ddaca2..5ddaca2 100644
--- a/plugins/pychrysa/format/symbol.c
+++ b/plugins/pychrysalide/format/symbol.c
diff --git a/plugins/pychrysa/format/symbol.h b/plugins/pychrysalide/format/symbol.h
index 0fe2ed8..913da74 100644
--- a/plugins/pychrysa/format/symbol.h
+++ b/plugins/pychrysalide/format/symbol.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_SYMBOL_H
-#define _PLUGINS_PYCHRYSA_FORMAT_SYMBOL_H
+#ifndef _PLUGINS_PYCHRYSALIDE_FORMAT_SYMBOL_H
+#define _PLUGINS_PYCHRYSALIDE_FORMAT_SYMBOL_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_binary_symbol(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_EXECUTABLE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_FORMAT_EXECUTABLE_H */
diff --git a/plugins/pychrysa/format/symiter.c b/plugins/pychrysalide/format/symiter.c
index db0b744..db0b744 100644
--- a/plugins/pychrysa/format/symiter.c
+++ b/plugins/pychrysalide/format/symiter.c
diff --git a/plugins/pychrysa/format/symiter.h b/plugins/pychrysalide/format/symiter.h
index 6cc1d29..6cc1d29 100644
--- a/plugins/pychrysa/format/symiter.h
+++ b/plugins/pychrysalide/format/symiter.h
diff --git a/plugins/pychrysa/glibext/Makefile.am b/plugins/pychrysalide/glibext/Makefile.am
index e4d5243..e4d5243 100644
--- a/plugins/pychrysa/glibext/Makefile.am
+++ b/plugins/pychrysalide/glibext/Makefile.am
diff --git a/plugins/pychrysa/glibext/buffercache.c b/plugins/pychrysalide/glibext/buffercache.c
index f61d34f..f61d34f 100644
--- a/plugins/pychrysa/glibext/buffercache.c
+++ b/plugins/pychrysalide/glibext/buffercache.c
diff --git a/plugins/pychrysa/glibext/buffercache.h b/plugins/pychrysalide/glibext/buffercache.h
index 8d88e08..dd41cfe 100644
--- a/plugins/pychrysa/glibext/buffercache.h
+++ b/plugins/pychrysalide/glibext/buffercache.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERCACHE_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERCACHE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERCACHE_H
+#define _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERCACHE_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_buffer_cache(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERCACHE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERCACHE_H */
diff --git a/plugins/pychrysa/glibext/bufferline.c b/plugins/pychrysalide/glibext/bufferline.c
index bfb894b..bfb894b 100644
--- a/plugins/pychrysa/glibext/bufferline.c
+++ b/plugins/pychrysalide/glibext/bufferline.c
diff --git a/plugins/pychrysa/glibext/bufferline.h b/plugins/pychrysalide/glibext/bufferline.h
index 86b567f..d905de3 100644
--- a/plugins/pychrysa/glibext/bufferline.h
+++ b/plugins/pychrysalide/glibext/bufferline.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERLINE_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERLINE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERLINE_H
+#define _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERLINE_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_buffer_line(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_BUFFERLINE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_BUFFERLINE_H */
diff --git a/plugins/pychrysa/glibext/configuration.c b/plugins/pychrysalide/glibext/configuration.c
index a780f73..a780f73 100644
--- a/plugins/pychrysa/glibext/configuration.c
+++ b/plugins/pychrysalide/glibext/configuration.c
diff --git a/plugins/pychrysa/glibext/configuration.h b/plugins/pychrysalide/glibext/configuration.h
index ec1a3d7..a34d8c2 100644
--- a/plugins/pychrysa/glibext/configuration.h
+++ b/plugins/pychrysalide/glibext/configuration.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GLIBEXT_CONFIGURATION_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_CONFIGURATION_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GLIBEXT_CONFIGURATION_H
+#define _PLUGINS_PYCHRYSALIDE_GLIBEXT_CONFIGURATION_H
 
 
 #include <Python.h>
@@ -63,4 +63,4 @@ bool register_python_generic_config(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_CONFIGURATION_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_CONFIGURATION_H */
diff --git a/plugins/pychrysa/glibext/linegen.c b/plugins/pychrysalide/glibext/linegen.c
index b6aad6b..b6aad6b 100644
--- a/plugins/pychrysa/glibext/linegen.c
+++ b/plugins/pychrysalide/glibext/linegen.c
diff --git a/plugins/pychrysa/glibext/linegen.h b/plugins/pychrysalide/glibext/linegen.h
index 8669bb7..6c2d161 100644
--- a/plugins/pychrysa/glibext/linegen.h
+++ b/plugins/pychrysalide/glibext/linegen.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GLIBEXT_LINEGEN_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_LINEGEN_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GLIBEXT_LINEGEN_H
+#define _PLUGINS_PYCHRYSALIDE_GLIBEXT_LINEGEN_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_line_generator(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_LINEGEN_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_LINEGEN_H */
diff --git a/plugins/pychrysa/glibext/loadedpanel.c b/plugins/pychrysalide/glibext/loadedpanel.c
index f831607..f831607 100644
--- a/plugins/pychrysa/glibext/loadedpanel.c
+++ b/plugins/pychrysalide/glibext/loadedpanel.c
diff --git a/plugins/pychrysa/glibext/loadedpanel.h b/plugins/pychrysalide/glibext/loadedpanel.h
index a133983..84f1741 100644
--- a/plugins/pychrysa/glibext/loadedpanel.h
+++ b/plugins/pychrysalide/glibext/loadedpanel.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GLIBEXT_LOADEDPANEL_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_LOADEDPANEL_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GLIBEXT_LOADEDPANEL_H
+#define _PLUGINS_PYCHRYSALIDE_GLIBEXT_LOADEDPANEL_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_loaded_panel(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_LOADEDPANEL_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_LOADEDPANEL_H */
diff --git a/plugins/pychrysa/glibext/module.c b/plugins/pychrysalide/glibext/module.c
index a3b0a25..a3b0a25 100644
--- a/plugins/pychrysa/glibext/module.c
+++ b/plugins/pychrysalide/glibext/module.c
diff --git a/plugins/pychrysa/glibext/module.h b/plugins/pychrysalide/glibext/module.h
index 5a29cca..5a29cca 100644
--- a/plugins/pychrysa/glibext/module.h
+++ b/plugins/pychrysalide/glibext/module.h
diff --git a/plugins/pychrysa/gtkext/Makefile.am b/plugins/pychrysalide/gtkext/Makefile.am
index 4a36e63..4a36e63 100644
--- a/plugins/pychrysa/gtkext/Makefile.am
+++ b/plugins/pychrysalide/gtkext/Makefile.am
diff --git a/plugins/pychrysa/gtkext/blockdisplay.c b/plugins/pychrysalide/gtkext/blockdisplay.c
index c2ccfbb..c2ccfbb 100644
--- a/plugins/pychrysa/gtkext/blockdisplay.c
+++ b/plugins/pychrysalide/gtkext/blockdisplay.c
diff --git a/plugins/pychrysa/gtkext/blockdisplay.h b/plugins/pychrysalide/gtkext/blockdisplay.h
index e4636a3..ab15ac5 100644
--- a/plugins/pychrysa/gtkext/blockdisplay.h
+++ b/plugins/pychrysalide/gtkext/blockdisplay.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GTKEXT_BLOCKDISPLAY_H
-#define _PLUGINS_PYCHRYSA_GTKEXT_BLOCKDISPLAY_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GTKEXT_BLOCKDISPLAY_H
+#define _PLUGINS_PYCHRYSALIDE_GTKEXT_BLOCKDISPLAY_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_block_display(PyObject *module);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GTKEXT_BLOCKDISPLAY_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GTKEXT_BLOCKDISPLAY_H */
diff --git a/plugins/pychrysa/gtkext/bufferdisplay.c b/plugins/pychrysalide/gtkext/bufferdisplay.c
index 9aa1bca..9aa1bca 100644
--- a/plugins/pychrysa/gtkext/bufferdisplay.c
+++ b/plugins/pychrysalide/gtkext/bufferdisplay.c
diff --git a/plugins/pychrysa/gtkext/bufferdisplay.h b/plugins/pychrysalide/gtkext/bufferdisplay.h
index b0cbd6c..4a21fb9 100644
--- a/plugins/pychrysa/gtkext/bufferdisplay.h
+++ b/plugins/pychrysalide/gtkext/bufferdisplay.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GTKEXT_BUFFERDISPLAY_H
-#define _PLUGINS_PYCHRYSA_GTKEXT_BUFFERDISPLAY_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GTKEXT_BUFFERDISPLAY_H
+#define _PLUGINS_PYCHRYSALIDE_GTKEXT_BUFFERDISPLAY_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_buffer_display(PyObject *module);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GTKEXT_BUFFERDISPLAY_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GTKEXT_BUFFERDISPLAY_H */
diff --git a/plugins/pychrysa/gtkext/displaypanel.c b/plugins/pychrysalide/gtkext/displaypanel.c
index b75d173..b75d173 100644
--- a/plugins/pychrysa/gtkext/displaypanel.c
+++ b/plugins/pychrysalide/gtkext/displaypanel.c
diff --git a/plugins/pychrysa/gtkext/displaypanel.h b/plugins/pychrysalide/gtkext/displaypanel.h
index c6787df..318a9f6 100644
--- a/plugins/pychrysa/gtkext/displaypanel.h
+++ b/plugins/pychrysalide/gtkext/displaypanel.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GTKEXT_DISPLAYPANEL_H
-#define _PLUGINS_PYCHRYSA_GTKEXT_DISPLAYPANEL_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GTKEXT_DISPLAYPANEL_H
+#define _PLUGINS_PYCHRYSALIDE_GTKEXT_DISPLAYPANEL_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_display_panel(PyObject *module);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GTKEXT_DISPLAYPANEL_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GTKEXT_DISPLAYPANEL_H */
diff --git a/plugins/pychrysa/gtkext/dockable.c b/plugins/pychrysalide/gtkext/dockable.c
index 9c66159..9c66159 100644
--- a/plugins/pychrysa/gtkext/dockable.c
+++ b/plugins/pychrysalide/gtkext/dockable.c
diff --git a/plugins/pychrysa/gtkext/dockable.h b/plugins/pychrysalide/gtkext/dockable.h
index 1709966..dfec74d 100644
--- a/plugins/pychrysa/gtkext/dockable.h
+++ b/plugins/pychrysalide/gtkext/dockable.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GTKEXT_DOCKABLE_H
-#define _PLUGINS_PYCHRYSA_GTKEXT_DOCKABLE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GTKEXT_DOCKABLE_H
+#define _PLUGINS_PYCHRYSALIDE_GTKEXT_DOCKABLE_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_gtk_dockable(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GTKEXT_DOCKABLE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GTKEXT_DOCKABLE_H */
diff --git a/plugins/pychrysa/gtkext/module.c b/plugins/pychrysalide/gtkext/module.c
index 8b2cc5e..8b2cc5e 100644
--- a/plugins/pychrysa/gtkext/module.c
+++ b/plugins/pychrysalide/gtkext/module.c
diff --git a/plugins/pychrysa/gtkext/module.h b/plugins/pychrysalide/gtkext/module.h
index a58aed0..a58aed0 100644
--- a/plugins/pychrysa/gtkext/module.h
+++ b/plugins/pychrysalide/gtkext/module.h
diff --git a/plugins/pychrysa/gui/Makefile.am b/plugins/pychrysalide/gui/Makefile.am
index d4a724d..d4a724d 100644
--- a/plugins/pychrysa/gui/Makefile.am
+++ b/plugins/pychrysalide/gui/Makefile.am
diff --git a/plugins/pychrysa/gui/editem.c b/plugins/pychrysalide/gui/editem.c
index 91f5246..91f5246 100644
--- a/plugins/pychrysa/gui/editem.c
+++ b/plugins/pychrysalide/gui/editem.c
diff --git a/plugins/pychrysa/gui/editem.h b/plugins/pychrysalide/gui/editem.h
index b6b3daf..e34690c 100644
--- a/plugins/pychrysa/gui/editem.h
+++ b/plugins/pychrysalide/gui/editem.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GUI_EDITEM_H
-#define _PLUGINS_PYCHRYSA_GUI_EDITEM_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GUI_EDITEM_H
+#define _PLUGINS_PYCHRYSALIDE_GUI_EDITEM_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_editor_item(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GUI_EDITEM_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_EDITEM_H */
diff --git a/plugins/pychrysa/gui/module.c b/plugins/pychrysalide/gui/module.c
index 192b1e6..192b1e6 100644
--- a/plugins/pychrysa/gui/module.c
+++ b/plugins/pychrysalide/gui/module.c
diff --git a/plugins/pychrysa/gui/module.h b/plugins/pychrysalide/gui/module.h
index 22acc15..8609d66 100644
--- a/plugins/pychrysa/gui/module.h
+++ b/plugins/pychrysalide/gui/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GUI_MODULE_H
-#define _PLUGINS_PYCHRYSA_GUI_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GUI_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_GUI_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_gui_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GUI_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_MODULE_H */
diff --git a/plugins/pychrysa/gui/panels/Makefile.am b/plugins/pychrysalide/gui/panels/Makefile.am
index 99e4c3f..99e4c3f 100644
--- a/plugins/pychrysa/gui/panels/Makefile.am
+++ b/plugins/pychrysalide/gui/panels/Makefile.am
diff --git a/plugins/pychrysa/gui/panels/module.c b/plugins/pychrysalide/gui/panels/module.c
index 21b487e..21b487e 100644
--- a/plugins/pychrysa/gui/panels/module.c
+++ b/plugins/pychrysalide/gui/panels/module.c
diff --git a/plugins/pychrysa/gui/panels/module.h b/plugins/pychrysalide/gui/panels/module.h
index 542754b..34fac70 100644
--- a/plugins/pychrysa/gui/panels/module.h
+++ b/plugins/pychrysalide/gui/panels/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H
-#define _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H
+#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_gui_panels_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H */
diff --git a/plugins/pychrysa/gui/panels/panel.c b/plugins/pychrysalide/gui/panels/panel.c
index 72c9e7e..72c9e7e 100644
--- a/plugins/pychrysa/gui/panels/panel.c
+++ b/plugins/pychrysalide/gui/panels/panel.c
diff --git a/plugins/pychrysa/gui/panels/panel.h b/plugins/pychrysalide/gui/panels/panel.h
index b10928c..f0406d5 100644
--- a/plugins/pychrysa/gui/panels/panel.h
+++ b/plugins/pychrysalide/gui/panels/panel.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H
-#define _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H
+#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_panel_item(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H */
diff --git a/plugins/pychrysa/helpers.c b/plugins/pychrysalide/helpers.c
index 17a396d..17a396d 100644
--- a/plugins/pychrysa/helpers.c
+++ b/plugins/pychrysalide/helpers.c
diff --git a/plugins/pychrysa/helpers.h b/plugins/pychrysalide/helpers.h
index 295ec28..9c914e5 100644
--- a/plugins/pychrysa/helpers.h
+++ b/plugins/pychrysalide/helpers.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_HELPERS_H
-#define _PLUGINS_PYCHRYSA_HELPERS_H
+#ifndef _PLUGINS_PYCHRYSALIDE_HELPERS_H
+#define _PLUGINS_PYCHRYSALIDE_HELPERS_H
 
 
 #include <glib-object.h>
@@ -90,4 +90,4 @@ bool _register_class_for_pygobject(PyObject *, GType, PyTypeObject *, PyTypeObje
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_HELPERS_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_HELPERS_H */
diff --git a/plugins/pychrysa/plugin.c b/plugins/pychrysalide/plugin.c
index fad0084..fad0084 100644
--- a/plugins/pychrysa/plugin.c
+++ b/plugins/pychrysalide/plugin.c
diff --git a/plugins/pychrysa/plugin.h b/plugins/pychrysalide/plugin.h
index ca451a8..1b7f7ba 100644
--- a/plugins/pychrysa/plugin.h
+++ b/plugins/pychrysalide/plugin.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_PLUGIN_H
-#define _PLUGINS_PYCHRYSA_PLUGIN_H
+#ifndef _PLUGINS_PYCHRYSALIDE_PLUGIN_H
+#define _PLUGINS_PYCHRYSALIDE_PLUGIN_H
 
 
 #include <Python.h>
@@ -72,4 +72,4 @@ bool register_python_plugin_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_PLUGIN_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_PLUGIN_H */
diff --git a/plugins/pychrysa/pychrysa.c b/plugins/pychrysalide/pychrysa.c
index 35d14f4..35d14f4 100644
--- a/plugins/pychrysa/pychrysa.c
+++ b/plugins/pychrysalide/pychrysa.c
diff --git a/plugins/pychrysa/pychrysa.h b/plugins/pychrysalide/pychrysa.h
index eb8fc5b..070345b 100644
--- a/plugins/pychrysa/pychrysa.h
+++ b/plugins/pychrysalide/pychrysa.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_H
-#define _PLUGINS_PYCHRYSA_H
+#ifndef _PLUGINS_PYCHRYSALIDE_H
+#define _PLUGINS_PYCHRYSALIDE_H
 
 
 /**
@@ -96,4 +96,4 @@ G_MODULE_EXPORT void chrysalide_plugin_exit(GPluginModule *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_H */
diff --git a/plugins/pychrysa/struct.c b/plugins/pychrysalide/struct.c
index 33b58b8..33b58b8 100644
--- a/plugins/pychrysa/struct.c
+++ b/plugins/pychrysalide/struct.c
diff --git a/plugins/pychrysa/struct.h b/plugins/pychrysalide/struct.h
index cca00b8..7c5391c 100644
--- a/plugins/pychrysa/struct.h
+++ b/plugins/pychrysalide/struct.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_STRUCT_H
-#define _PLUGINS_PYCHRYSA_STRUCT_H
+#ifndef _PLUGINS_PYCHRYSALIDE_STRUCT_H
+#define _PLUGINS_PYCHRYSALIDE_STRUCT_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_py_struct(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_STRUCT_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_STRUCT_H */
diff --git a/plugins/pychrysa/weak.c b/plugins/pychrysalide/weak.c
index 59c5666..59c5666 100644
--- a/plugins/pychrysa/weak.c
+++ b/plugins/pychrysalide/weak.c
diff --git a/plugins/pychrysa/weak.h b/plugins/pychrysalide/weak.h
index a0aadbf..e5e7d39 100644
--- a/plugins/pychrysa/weak.h
+++ b/plugins/pychrysalide/weak.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_WEAK_H
-#define _PLUGINS_PYCHRYSA_WEAK_H
+#ifndef _PLUGINS_PYCHRYSALIDE_WEAK_H
+#define _PLUGINS_PYCHRYSALIDE_WEAK_H
 
 
 #include <gtkext/gtkstatusstack.h>
@@ -47,4 +47,4 @@ void gtk_status_stack_remove_activity(GtkStatusStack *, activity_id_t) __attribu
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_WEAK_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_WEAK_H */