Rename shiboken2 to shiboken6

Adapt CMake files, build scripts, tests and examples.

Task-number: PYSIDE-904
Change-Id: I4cb5ee4c8df539546014b08202a7b1e98ed3ff07
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

725 files changed, 388 insertions, 388 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e38b5231..6b18250bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,13 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed.")
 endif()
 
-# Used to prevent overriding message function in both shiboken2 and pyside2.
+# Used to prevent overriding message function in both shiboken6 and pyside2.
 set(is_pyside2_superproject_build 1)
 
-add_subdirectory(sources/shiboken2)
+add_subdirectory(sources/shiboken6)
 
 # Semi-hack to include exported shiboken variables.
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/shiboken2/data")
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/shiboken6/data")
 add_subdirectory(sources/pyside2)
 
 add_subdirectory(sources/pyside-tools)
diff --git a/README.md b/README.md
index fe61136b2..6ece308b2 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ Qt For Python is the [Python Qt bindings project](http://wiki.qt.io/PySide2), pr
 access to the complete Qt 5.x framework as well as to generator tools for rapidly
 generating bindings for any C++ libraries.
 
-shiboken2 is the generator used to build the bindings.
+shiboken6 is the generator used to build the bindings.
 
-See README.pyside2.md and README.shiboken2.md for details.
+See README.pyside2.md and README.shiboken6.md for details.
diff --git a/README.shiboken2-generator.md b/README.shiboken6-generator.md
index a7fd32244..3b77edcf2 100644
--- a/README.shiboken2-generator.md
+++ b/README.shiboken6-generator.md
@@ -1,4 +1,4 @@
-# Shiboken2-generator
+# Shiboken6-generator
 
 Shiboken is the generator used by the Qt for Python project.
 It outputs C++ code for CPython extensions, which can be compiled
@@ -24,7 +24,7 @@ An example related to wrap a C++ library not depending on Qt
 can be found in our [repository](https://code.qt.io/cgit/pyside/pyside-setup.git/tree/examples/samplebinding).
 
 Additionally, you can find a couple of tests inside the
-[git repository](https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/shiboken2/tests).
+[git repository](https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/shiboken6/tests).
 
 For a more advanced case regarding extending a Qt/C++ application
 with Python bindings based on the idea of the PySide module,
@@ -34,4 +34,4 @@ example in our repository.
 # Documentation
 
 You can find more information about Shiboken in our
-[official documentation page](https://doc.qt.io/qtforpython/shiboken2/).
+[official documentation page](https://doc.qt.io/qtforpython/shiboken6/).
diff --git a/README.shiboken2.md b/README.shiboken6.md
index 3d92f2a46..2040f481d 100644
--- a/README.shiboken2.md
+++ b/README.shiboken6.md
@@ -1,6 +1,6 @@
-# Shiboken2 module
+# Shiboken6 module
 
-The purpose of the [shiboken2 Python module](https://wiki.qt.io/Qt_for_Python/Shiboken)
+The purpose of the [shiboken6 Python module](https://wiki.qt.io/Qt_for_Python/Shiboken)
 is to access information related to the binding generation that could be used to integrate
 C++ programs to Python, or even to get useful information to debug
 an application.
@@ -10,4 +10,4 @@ where one can check if it is valid, or if the generated Python wrapper
 is invalid after the underlying C++ object has been destroyed.
 
 More information on the available functions can be found
-in our [official documentation](https://doc.qt.io/qtforpython/shiboken2/shibokenmodule.html)
+in our [official documentation](https://doc.qt.io/qtforpython/shiboken6/shibokenmodule.html)
diff --git a/build_scripts/config.py b/build_scripts/config.py
index a69e8fe81..242e39d68 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -57,10 +57,10 @@ class Config(object):
         self.invocation_type = None
 
         # The type of the top-level build.
-        # all - build shiboken2 module, shiboken2-generator and PySide2
+        # all - build shiboken6 module, shiboken6-generator and PySide2
         #       modules
-        # shiboken2 - build only shiboken2 module
-        # shiboken2-generator - build only the shiboken2-generator
+        # shiboken6 - build only shiboken6 module
+        # shiboken6-generator - build only the shiboken6-generator
         # pyside2 - build only PySide2 modules
         self.build_type = None
 
@@ -70,15 +70,15 @@ class Config(object):
 
         # Options that can be given to --build-type and
         # --internal-build-type
-        self.shiboken_module_option_name = "shiboken2"
-        self.shiboken_generator_option_name = "shiboken2-generator"
+        self.shiboken_module_option_name = "shiboken6"
+        self.shiboken_generator_option_name = "shiboken6-generator"
         self.pyside_option_name = "pyside2"
 
         # Names to be passed to setuptools.setup() name key,
         # so not package name, but rather project name as it appears
         # in the wheel name and on PyPi.
-        self.shiboken_module_st_name = "shiboken2"
-        self.shiboken_generator_st_name = "shiboken2-generator"
+        self.shiboken_module_st_name = "shiboken6"
+        self.shiboken_generator_st_name = "shiboken6-generator"
         self.pyside_st_name = "PySide2"
 
         # Used by check_allowed_python_version to validate the
@@ -200,7 +200,7 @@ class Config(object):
             setup_kwargs['install_requires'] = ["{}=={}".format(self.shiboken_module_st_name, package_version)]
             setup_kwargs['entry_points'] = {
                 'console_scripts': [
-                    'shiboken2 = {}.scripts.shiboken_tool:main'.format(self.package_name()),
+                    'shiboken6 = {}.scripts.shiboken_tool:main'.format(self.package_name()),
                 ]
             }
 
@@ -223,9 +223,9 @@ class Config(object):
         changes_filename = 'CHANGES.rst'
 
         if self.is_internal_shiboken_module_build():
-            readme_filename = 'README.shiboken2.md'
+            readme_filename = 'README.shiboken6.md'
         elif self.is_internal_shiboken_generator_build():
-            readme_filename = 'README.shiboken2-generator.md'
+            readme_filename = 'README.shiboken6-generator.md'
         elif self.is_internal_pyside_build():
             readme_filename = 'README.pyside2.md'
 
@@ -264,9 +264,9 @@ class Config(object):
         dashes.
         """
         if self.is_internal_shiboken_module_build():
-            return "shiboken2"
+            return "shiboken6"
         elif self.is_internal_shiboken_generator_build():
-            return "shiboken2_generator"
+            return "shiboken6_generator"
         elif self.is_internal_pyside_build():
             return "PySide2"
         else:
@@ -298,8 +298,8 @@ class Config(object):
         the actual module packages are located.
 
         For example when building the shiboken module, setuptools will
-        expect to find the "shiboken2" module sources under
-        "sources/shiboken2/shibokenmodule".
+        expect to find the "shiboken6" module sources under
+        "sources/shiboken6/shibokenmodule".
 
         This is really just to satisfy some checks in setuptools
         build_py command, and if we ever properly implement the develop
@@ -307,7 +307,7 @@ class Config(object):
         """
         if self.is_internal_shiboken_module_build():
             return {
-                self.package_name(): "sources/shiboken2/shibokenmodule"
+                self.package_name(): "sources/shiboken6/shibokenmodule"
             }
         elif self.is_internal_shiboken_generator_build():
             # This is left empty on purpose, because the shiboken
@@ -326,7 +326,7 @@ class Config(object):
         :return: A list of directory names under the sources directory.
         """
         if self.is_internal_shiboken_module_build() or self.is_internal_shiboken_generator_build():
-            return ['shiboken2']
+            return ['shiboken6']
         elif self.is_internal_pyside_build():
             return ['pyside2', 'pyside-tools']
         return None
@@ -371,7 +371,7 @@ class Config(object):
         """
         Used to skip certain build rules and output, when we know that
         the CMake build of shiboken was already done as part of the
-        top-level "all" build when shiboken2-module was built.
+        top-level "all" build when shiboken6-module was built.
         """
         return self.is_internal_shiboken_generator_build() and self.is_top_level_build_all()
 
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 384ae6785..fb445ea2e 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -560,7 +560,7 @@ class PysideBuild(_build, DistUtilsCommandMixin):
 
         # Save the shiboken build dir path for clang deployment
         # purposes.
-        self.shiboken_build_dir = os.path.join(self.build_dir, "shiboken2")
+        self.shiboken_build_dir = os.path.join(self.build_dir, "shiboken6")
 
         self.log_pre_build_info()
 
@@ -741,11 +741,11 @@ class PysideBuild(_build, DistUtilsCommandMixin):
         # If a custom shiboken cmake config directory path was provided, pass it to CMake.
         if OPTION["SHIBOKEN_CONFIG_DIR"] and config.is_internal_pyside_build():
             if os.path.exists(OPTION["SHIBOKEN_CONFIG_DIR"]):
-                log.info("Using custom provided shiboken2 installation: {}"
+                log.info("Using custom provided shiboken6 installation: {}"
                          .format(OPTION["SHIBOKEN_CONFIG_DIR"]))
-                cmake_cmd.append("-DShiboken2_DIR={}".format(OPTION["SHIBOKEN_CONFIG_DIR"]))
+                cmake_cmd.append("-DShiboken6_DIR={}".format(OPTION["SHIBOKEN_CONFIG_DIR"]))
             else:
-                log.info("Custom provided shiboken2 installation not found. Path given: {}"
+                log.info("Custom provided shiboken6 installation not found. Path given: {}"
                          .format(OPTION["SHIBOKEN_CONFIG_DIR"]))
 
         if OPTION["MODULE_SUBSET"]:
@@ -821,7 +821,7 @@ class PysideBuild(_build, DistUtilsCommandMixin):
             timestamp = get_package_timestamp()
         cmake_cmd.append("-DPACKAGE_SETUP_PY_PACKAGE_TIMESTAMP={}".format(timestamp))
 
-        if extension.lower() in ["shiboken2"]:
+        if extension.lower() in ["shiboken6"]:
             cmake_cmd.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes")
             cmake_cmd.append("-DUSE_PYTHON_VERSION=3.6")
 
@@ -890,7 +890,7 @@ class PysideBuild(_build, DistUtilsCommandMixin):
             raise DistutilsSetupError("Error compiling {}".format(extension))
 
         if not OPTION["SKIP_DOCS"]:
-            if extension.lower() == "shiboken2":
+            if extension.lower() == "shiboken6":
                 try:
                     # Check if sphinx is installed to proceed.
                     import sphinx
@@ -994,7 +994,7 @@ class PysideBuild(_build, DistUtilsCommandMixin):
 
     def prepare_standalone_clang(self, is_win=False):
         """
-        Copies the libclang library to the shiboken2-generator
+        Copies the libclang library to the shiboken6-generator
         package so that the shiboken executable works.
         """
         log.info('Finding path to the libclang shared library.')
@@ -1028,7 +1028,7 @@ class PysideBuild(_build, DistUtilsCommandMixin):
                                     'bin/libclang.dll',
                                     clang_lib_path)
         else:
-            # shiboken2 links against libclang.so.6 or a similarly
+            # shiboken6 links against libclang.so.6 or a similarly
             # named library.
             # If the linked against library is a symlink, resolve
             # the symlink once (but not all the way to the real
@@ -1144,9 +1144,9 @@ class PysideRstDocs(Command, DistUtilsCommandMixin):
             try:
                 # Check if sphinx is installed to proceed.
                 import sphinx
-                if self.name == "shiboken2":
+                if self.name == "shiboken6":
                     log.info("-- Generating Shiboken documentation")
-                    log.info("-- Documentation directory: 'html/pyside2/shiboken2/'")
+                    log.info("-- Documentation directory: 'html/pyside2/shiboken6/'")
                 elif self.name == "pyside2":
                     log.info("-- Generating PySide documentation")
                     log.info("-- Documentation directory: 'html/pyside2/'")
@@ -1154,15 +1154,15 @@ class PysideRstDocs(Command, DistUtilsCommandMixin):
                 raise DistutilsSetupError("Sphinx not found - aborting")
             self.html_dir = "html"
 
-            # creating directories html/pyside2/shiboken2
+            # creating directories html/pyside2/shiboken6
             try:
                 if not os.path.isdir(self.html_dir):
                     os.mkdir(self.html_dir)
-                if self.name == "shiboken2":
+                if self.name == "shiboken6":
                     out_pyside = os.path.join(self.html_dir, "pyside2")
                     if not os.path.isdir(out_pyside):
                         os.mkdir(out_pyside)
-                    out_shiboken = os.path.join(out_pyside, "shiboken2")
+                    out_shiboken = os.path.join(out_pyside, "shiboken6")
                     if not os.path.isdir(out_shiboken):
                         os.mkdir(out_shiboken)
                     self.out_dir = out_shiboken
@@ -1187,7 +1187,7 @@ class PysideRstDocs(Command, DistUtilsCommandMixin):
 
             if self.name == "pyside2":
                 self.sphinx_src = os.path.join(self.out_dir, "rst")
-            elif self.name == "shiboken2":
+            elif self.name == "shiboken6":
                 self.sphinx_src = self.out_dir
 
             sphinx_cmd = ["sphinx-build", "-b", "html", "-c", self.sphinx_src,
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py
index 712739e05..ddfd8e21a 100644
--- a/build_scripts/platforms/linux.py
+++ b/build_scripts/platforms/linux.py
@@ -85,7 +85,7 @@ def prepare_standalone_package_linux(self, vars):
         # which ICU libs are used by QtCore (if used at all) using a
         # custom written ldd, and copy the ICU libs to the Pyside Qt
         # dir if necessary. We choose the QtCore lib to inspect, by
-        # checking which QtCore library the shiboken2 executable uses.
+        # checking which QtCore library the shiboken6 executable uses.
         if not maybe_icu_libs:
             copy_icu_libs(self._patchelf_path, resolved_destination_lib_dir)
 
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 30fa237c7..1e1c1e4a8 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -72,11 +72,11 @@ def prepare_packages_posix(self, vars):
         return name + postfix
 
     if config.is_internal_shiboken_module_build():
-        # <build>/shiboken2/doc/html/* ->
-        #   <setup>/{st_package_name}/docs/shiboken2
+        # <build>/shiboken6/doc/html/* ->
+        #   <setup>/{st_package_name}/docs/shiboken6
         copydir(
-            "{build_dir}/shiboken2/doc/html",
-            "{st_build_dir}/{st_package_name}/docs/shiboken2",
+            "{build_dir}/shiboken6/doc/html",
+            "{st_build_dir}/{st_package_name}/docs/shiboken6",
             force=False, vars=vars)
 
         # <install>/lib/lib* -> {st_package_name}/
@@ -95,7 +95,7 @@ def prepare_packages_posix(self, vars):
             "{install_dir}/bin/",
             "{st_build_dir}/{st_package_name}",
             filter=[
-                "shiboken2",
+                "shiboken6",
             ],
             recursive=False, vars=vars))
 
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index 77bf9bfd2..83485e1d7 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -66,11 +66,11 @@ def prepare_packages_win32(self, vars):
         vars=vars)
 
     if config.is_internal_shiboken_module_build():
-        # <build>/shiboken2/doc/html/* ->
-        #   <setup>/{st_package_name}/docs/shiboken2
+        # <build>/shiboken6/doc/html/* ->
+        #   <setup>/{st_package_name}/docs/shiboken6
         copydir(
-            "{build_dir}/shiboken2/doc/html",
-            "{st_build_dir}/{st_package_name}/docs/shiboken2",
+            "{build_dir}/shiboken6/doc/html",
+            "{st_build_dir}/{st_package_name}/docs/shiboken6",
             force=False, vars=vars)
 
         # <install>/bin/*.dll -> {st_package_name}/
@@ -91,14 +91,14 @@ def prepare_packages_win32(self, vars):
         # {shibokengenerator}.pdb file.
         # Task-number: PYSIDE-615
         copydir(
-            "{build_dir}/shiboken2/shibokenmodule",
+            "{build_dir}/shiboken6/shibokenmodule",
             "{st_build_dir}/{st_package_name}",
             filter=pdbs,
             recursive=False, vars=vars)
 
         # pdb files for libshiboken and libpyside
         copydir(
-            "{build_dir}/shiboken2/libshiboken",
+            "{build_dir}/shiboken6/libshiboken",
             "{st_build_dir}/{st_package_name}",
             filter=pdbs,
             recursive=False, vars=vars)
@@ -126,7 +126,7 @@ def prepare_packages_win32(self, vars):
         # {shibokenmodule}.pdb file.
         # Task-number: PYSIDE-615
         copydir(
-            "{build_dir}/shiboken2/generator",
+            "{build_dir}/shiboken6/generator",
             "{st_build_dir}/{st_package_name}",
             filter=pdbs,
             recursive=False, vars=vars)
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index 6b944c2c8..3b6c6e117 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -129,7 +129,7 @@ class SetupRunner(object):
             raise RuntimeError("Invalid '{}' option given to --build-type. "
                                .format(config.build_type))
 
-        # Build everything: shiboken2, shiboken2-generator and PySide2.
+        # Build everything: shiboken6, shiboken6-generator and PySide2.
         help_requested = '--help' in self.sub_argv or '-h' in self.sub_argv
         if help_requested:
             self.add_setup_internal_invocation(config.pyside_option_name)
diff --git a/examples/opengl/hellogl2.py b/examples/opengl/hellogl2.py
index b12a7b275..fd5d79be3 100644
--- a/examples/opengl/hellogl2.py
+++ b/examples/opengl/hellogl2.py
@@ -55,7 +55,7 @@ from PySide2.QtWidgets import (QApplication, QWidget, QMessageBox, QHBoxLayout,
     QSlider)
 from PySide2.QtOpenGLWidgets import QOpenGLWidget
 
-from shiboken2 import VoidPtr
+from shiboken6 import VoidPtr
 
 try:
     from OpenGL import GL
diff --git a/examples/samplebinding/CMakeLists.txt b/examples/samplebinding/CMakeLists.txt
index f7651e04f..8a2e55d66 100644
--- a/examples/samplebinding/CMakeLists.txt
+++ b/examples/samplebinding/CMakeLists.txt
@@ -70,14 +70,14 @@ macro(pyside2_config option output_var)
 endmacro()
 
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path shiboken2_module_path)
-pyside2_config(--shiboken2-generator-path shiboken2_generator_path)
+pyside2_config(--shiboken6-module-path shiboken6_module_path)
+pyside2_config(--shiboken6-generator-path shiboken6_generator_path)
 pyside2_config(--python-include-path python_include_dir)
-pyside2_config(--shiboken2-generator-include-path shiboken_include_dir 1)
-pyside2_config(--shiboken2-module-shared-libraries-cmake shiboken_shared_libraries 0)
+pyside2_config(--shiboken6-generator-include-path shiboken_include_dir 1)
+pyside2_config(--shiboken6-module-shared-libraries-cmake shiboken_shared_libraries 0)
 pyside2_config(--python-link-flags-cmake python_linking_data 0)
 
-set(shiboken_path "${shiboken2_generator_path}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(shiboken_path "${shiboken6_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 if(NOT EXISTS ${shiboken_path})
     message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}")
 endif()
@@ -93,7 +93,7 @@ endif()
 # Enable rpaths so that the built shared libraries find their dependencies.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${shiboken2_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_INSTALL_RPATH ${shiboken6_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.
diff --git a/examples/samplebinding/README.md b/examples/samplebinding/README.md
index e84d1eff4..34f3568f2 100644
--- a/examples/samplebinding/README.md
+++ b/examples/samplebinding/README.md
@@ -139,7 +139,7 @@ For Windows you will also need:
   or all Debug).
 
 The build uses the `pyside2_config.py` file to configure the project
-using the current PySide2/Shiboken2 installation.
+using the current PySide2/Shiboken6 installation.
 
 ### Using CMake
 
@@ -232,5 +232,5 @@ In practice this means the only supported configurations are:
 This is necessary because all the shared libraries in question have to
 link to the same C++ runtime library (`msvcrt.dll` or `msvcrtd.dll`).
 To make the example as self-contained as possible, the shared libraries
-in use (`pyside2.dll`, `shiboken2.dll`) are hard-linked into the build
+in use (`pyside2.dll`, `shiboken6.dll`) are hard-linked into the build
 folder of the application.
diff --git a/examples/scriptableapplication/CMakeLists.txt b/examples/scriptableapplication/CMakeLists.txt
index 8537ed8fb..f9fc25040 100644
--- a/examples/scriptableapplication/CMakeLists.txt
+++ b/examples/scriptableapplication/CMakeLists.txt
@@ -42,20 +42,20 @@ macro(pyside2_config option output_var)
     endif()
 endmacro()
 
-# Query for the shiboken2-generator path, PySide2 path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path SHIBOKEN2_MODULE_PATH)
-pyside2_config(--shiboken2-generator-path SHIBOKEN2_GENERATOR_PATH)
+# Query for the shiboken6-generator path, PySide2 path, Python path, include paths and linker flags.
+pyside2_config(--shiboken6-module-path SHIBOKEN6_MODULE_PATH)
+pyside2_config(--shiboken6-generator-path SHIBOKEN6_GENERATOR_PATH)
 pyside2_config(--pyside2-path PYSIDE2_PATH)
 
 pyside2_config(--python-include-path PYTHON_INCLUDE_DIR)
-pyside2_config(--shiboken2-generator-include-path SHIBOKEN2_GENERATOR_INCLUDE_DIR 1)
+pyside2_config(--shiboken6-generator-include-path SHIBOKEN6_GENERATOR_INCLUDE_DIR 1)
 pyside2_config(--pyside2-include-path PYSIDE2_INCLUDE_DIR 1)
 
 pyside2_config(--python-link-flags-cmake PYTHON_LINKING_DATA 0)
-pyside2_config(--shiboken2-module-shared-libraries-cmake SHIBOKEN2_MODULE_SHARED_LIBRARIES 0)
+pyside2_config(--shiboken6-module-shared-libraries-cmake SHIBOKEN6_MODULE_SHARED_LIBRARIES 0)
 pyside2_config(--pyside2-shared-libraries-cmake PYSIDE2_SHARED_LIBRARIES 0)
 
-set(SHIBOKEN_PATH "${SHIBOKEN2_GENERATOR_PATH}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(SHIBOKEN_PATH "${SHIBOKEN6_GENERATOR_PATH}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 
 if(NOT EXISTS ${SHIBOKEN_PATH})
     message(FATAL_ERROR "Shiboken executable not found at path: ${SHIBOKEN_PATH}")
@@ -135,7 +135,7 @@ endforeach()
 # Enable rpaths so that the example can be executed from the build dir.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${PYSIDE2_PATH} ${SHIBOKEN2_MODULE_PATH})
+set(CMAKE_INSTALL_RPATH ${PYSIDE2_PATH} ${SHIBOKEN6_MODULE_PATH})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.
@@ -152,13 +152,13 @@ target_sources(${PROJECT_NAME} PUBLIC ${SOURCES})
 
 # Apply relevant include and link flags.
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYTHON_INCLUDE_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE ${SHIBOKEN2_GENERATOR_INCLUDE_DIR})
+target_include_directories(${PROJECT_NAME} PRIVATE ${SHIBOKEN6_GENERATOR_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_ADDITIONAL_INCLUDES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
-target_link_libraries(${PROJECT_NAME} PRIVATE ${SHIBOKEN2_MODULE_SHARED_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${SHIBOKEN6_MODULE_SHARED_LIBRARIES})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${PYSIDE2_SHARED_LIBRARIES})
 
 # Find and link to the python library.
@@ -191,7 +191,7 @@ if(WIN32)
 
     # Add custom target to hard link PySide2 shared libraries (just like in qmake example), so you
     # don't have to set PATH manually to point to the PySide2 package.
-    set(shared_libraries ${SHIBOKEN2_MODULE_SHARED_LIBRARIES} ${PYSIDE2_SHARED_LIBRARIES})
+    set(shared_libraries ${SHIBOKEN6_MODULE_SHARED_LIBRARIES} ${PYSIDE2_SHARED_LIBRARIES})
     foreach(LIBRARY_PATH ${shared_libraries})
         string(REGEX REPLACE ".lib$" ".dll" LIBRARY_PATH ${LIBRARY_PATH})
         get_filename_component(BASE_NAME ${LIBRARY_PATH} NAME)
diff --git a/examples/scriptableapplication/README.md b/examples/scriptableapplication/README.md
index d359581f1..c388f61de 100644
--- a/examples/scriptableapplication/README.md
+++ b/examples/scriptableapplication/README.md
@@ -50,7 +50,7 @@ For Windows you will also need:
   packages, because none of the supported ones are built with MSVC2008.
 
 Both build options will use the `pyside2_config.py` file to configure the project
-using the current PySide2/Shiboken2 installation (for qmake via pyside2.pri,
+using the current PySide2/Shiboken6 installation (for qmake via pyside2.pri,
 and for CMake via the project CMakeLists.txt).
 
 
@@ -166,5 +166,5 @@ In practice this means the only supported configurations are:
 This is necessary because all the shared libraries in question have to
 link to the same C++ runtime library (`msvcrt.dll` or `msvcrtd.dll`).
 To make the example as self-contained as possible, the shared libraries
-in use (`pyside2.dll`, `shiboken2.dll`) are hard-linked into the build
+in use (`pyside2.dll`, `shiboken6.dll`) are hard-linked into the build
 folder of the application.
diff --git a/examples/scriptableapplication/pyside2.pri b/examples/scriptableapplication/pyside2.pri
index 2da3bc880..d97ad229a 100644
--- a/examples/scriptableapplication/pyside2.pri
+++ b/examples/scriptableapplication/pyside2.pri
@@ -6,11 +6,11 @@ isEmpty(python_interpreter) {
 }
 message(Using python interpreter: $$python_interpreter)
 
-SHIBOKEN2_GENERATOR = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-generator-path)
-isEmpty(SHIBOKEN2_GENERATOR): error(Unable to locate the shiboken2-generator package location)
+SHIBOKEN6_GENERATOR = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-generator-path)
+isEmpty(SHIBOKEN6_GENERATOR): error(Unable to locate the shiboken6-generator package location)
 
-SHIBOKEN2_MODULE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-path)
-isEmpty(SHIBOKEN2_MODULE): error(Unable to locate the shiboken2 package location)
+SHIBOKEN6_MODULE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-path)
+isEmpty(SHIBOKEN6_MODULE): error(Unable to locate the shiboken6 package location)
 
 PYSIDE2 = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-path)
 isEmpty(PYSIDE2): error(Unable to locate the PySide2 package location)
@@ -21,32 +21,32 @@ isEmpty(PYTHON_INCLUDE): error(Unable to locate the Python include headers direc
 PYTHON_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --python-link-flags-qmake)
 isEmpty(PYTHON_LFLAGS): error(Unable to locate the Python library for linking)
 
-SHIBOKEN2_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-generator-include-path)
-isEmpty(SHIBOKEN2_INCLUDE): error(Unable to locate the shiboken include headers directory)
+SHIBOKEN6_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-generator-include-path)
+isEmpty(SHIBOKEN6_INCLUDE): error(Unable to locate the shiboken include headers directory)
 
 PYSIDE2_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-include-path)
 isEmpty(PYSIDE2_INCLUDE): error(Unable to locate the PySide2 include headers directory)
 
-SHIBOKEN2_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-qmake-lflags)
-isEmpty(SHIBOKEN2_LFLAGS): error(Unable to locate the shiboken libraries for linking)
+SHIBOKEN6_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-qmake-lflags)
+isEmpty(SHIBOKEN6_LFLAGS): error(Unable to locate the shiboken libraries for linking)
 
 PYSIDE2_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-qmake-lflags)
 isEmpty(PYSIDE2_LFLAGS): error(Unable to locate the PySide2 libraries for linking)
 
-SHIBOKEN2_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-shared-libraries-qmake)
-isEmpty(SHIBOKEN2_SHARED_LIBRARIES): error(Unable to locate the used shiboken2 module shared libraries)
+SHIBOKEN6_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-shared-libraries-qmake)
+isEmpty(SHIBOKEN6_SHARED_LIBRARIES): error(Unable to locate the used shiboken6 module shared libraries)
 
 PYSIDE2_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-shared-libraries-qmake)
 isEmpty(PYSIDE2_SHARED_LIBRARIES): error(Unable to locate the used PySide2 shared libraries)
 
-INCLUDEPATH += "$$PYTHON_INCLUDE" $$PYSIDE2_INCLUDE $$SHIBOKEN2_INCLUDE
-LIBS += $$PYTHON_LFLAGS $$PYSIDE2_LFLAGS $$SHIBOKEN2_LFLAGS
+INCLUDEPATH += "$$PYTHON_INCLUDE" $$PYSIDE2_INCLUDE $$SHIBOKEN6_INCLUDE
+LIBS += $$PYTHON_LFLAGS $$PYSIDE2_LFLAGS $$SHIBOKEN6_LFLAGS
 !build_pass:message(INCLUDEPATH is $$INCLUDEPATH)
 !build_pass:message(LIBS are $$LIBS)
 
 !build_pass:message(Using $$PYSIDE2)
 
 !win32 {
-    !build_pass:message(RPATH will include $$PYSIDE2 and $$SHIBOKEN2_MODULE)
-    QMAKE_RPATHDIR += $$PYSIDE2 $$SHIBOKEN2_MODULE
+    !build_pass:message(RPATH will include $$PYSIDE2 and $$SHIBOKEN6_MODULE)
+    QMAKE_RPATHDIR += $$PYSIDE2 $$SHIBOKEN6_MODULE
 }
diff --git a/examples/scriptableapplication/scriptableapplication.pro b/examples/scriptableapplication/scriptableapplication.pro
index 8ebab9476..067d9141f 100644
--- a/examples/scriptableapplication/scriptableapplication.pro
+++ b/examples/scriptableapplication/scriptableapplication.pro
@@ -23,7 +23,7 @@ SHIBOKEN_OPTIONS = --generator-set=shiboken --enable-parent-ctor-heuristic \
 win32:SHIBOKEN_OPTIONS += --avoid-protected-hack
 
 # Prepare the shiboken tool
-QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN2_GENERATOR/shiboken2)
+QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN6_GENERATOR/shiboken6)
 qtPrepareTool(SHIBOKEN, shiboken)
 
 # Shiboken run that adds the module wrapper to GENERATED_SOURCES
@@ -61,7 +61,7 @@ win32 {
     hard_link_libraries.CONFIG = no_link target_predeps explicit_dependencies
     hard_link_libraries.output = $$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
     hard_link_libraries.commands = mklink /H $$shell_path($$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}) $$shell_path(${QMAKE_FILE_IN})
-    hard_link_libraries.input = PYSIDE2_SHARED_LIBRARIES SHIBOKEN2_SHARED_LIBRARIES
+    hard_link_libraries.input = PYSIDE2_SHARED_LIBRARIES SHIBOKEN6_SHARED_LIBRARIES
 }
 
 QMAKE_EXTRA_COMPILERS += shiboken module_wrapper_dummy_command
diff --git a/examples/utils/pyside2_config.py b/examples/utils/pyside2_config.py
index 973410100..f759b11e5 100644
--- a/examples/utils/pyside2_config.py
+++ b/examples/utils/pyside2_config.py
@@ -45,8 +45,8 @@ generic_error = (' Did you forget to activate your virtualenv? Or perhaps'
                  ' you forgot to build / install PySide2 into your currently active Python'
                  ' environment?')
 pyside2_error = 'Unable to locate PySide2.' + generic_error
-shiboken2_module_error = 'Unable to locate shiboken2-module.' + generic_error
-shiboken2_generator_error = 'Unable to locate shiboken2-generator.' + generic_error
+shiboken6_module_error = 'Unable to locate shiboken6-module.' + generic_error
+shiboken6_generator_error = 'Unable to locate shiboken6-generator.' + generic_error
 pyside2_libs_error = 'Unable to locate the PySide2 shared libraries.' + generic_error
 python_link_error = 'Unable to locate the Python library for linking.'
 python_include_error = 'Unable to locate the Python include headers directory.'
@@ -54,14 +54,14 @@ python_include_error = 'Unable to locate the Python include headers directory.'
 options = []
 
 # option, function, error, description
-options.append(("--shiboken2-module-path",
-                lambda: find_shiboken2_module(),
-                shiboken2_module_error,
-                "Print shiboken2 module location"))
-options.append(("--shiboken2-generator-path",
-                lambda: find_shiboken2_generator(),
-                shiboken2_generator_error,
-                "Print shiboken2 generator location"))
+options.append(("--shiboken6-module-path",
+                lambda: find_shiboken6_module(),
+                shiboken6_module_error,
+                "Print shiboken6 module location"))
+options.append(("--shiboken6-generator-path",
+                lambda: find_shiboken6_generator(),
+                shiboken6_generator_error,
+                "Print shiboken6 generator location"))
 options.append(("--pyside2-path", lambda: find_pyside2(), pyside2_error,
                 "Print PySide2 location"))
 
@@ -69,10 +69,10 @@ options.append(("--python-include-path",
                 lambda: get_python_include_path(),
                 python_include_error,
                 "Print Python include path"))
-options.append(("--shiboken2-generator-include-path",
-                lambda: get_package_include_path(Package.shiboken2_generator),
+options.append(("--shiboken6-generator-include-path",
+                lambda: get_package_include_path(Package.shiboken6_generator),
                 pyside2_error,
-                "Print shiboken2 generator include paths"))
+                "Print shiboken6 generator include paths"))
 options.append(("--pyside2-include-path",
                 lambda: get_package_include_path(Package.pyside2),
                 pyside2_error,
@@ -83,19 +83,19 @@ options.append(("--python-link-flags-qmake", lambda: python_link_flags_qmake(),
 options.append(("--python-link-flags-cmake", lambda: python_link_flags_cmake(), python_link_error,
                 "Print python link flags for cmake"))
 
-options.append(("--shiboken2-module-qmake-lflags",
-                lambda: get_package_qmake_lflags(Package.shiboken2_module), pyside2_error,
-                "Print shiboken2 shared library link flags for qmake"))
+options.append(("--shiboken6-module-qmake-lflags",
+                lambda: get_package_qmake_lflags(Package.shiboken6_module), pyside2_error,
+                "Print shiboken6 shared library link flags for qmake"))
 options.append(("--pyside2-qmake-lflags",
                 lambda: get_package_qmake_lflags(Package.pyside2), pyside2_error,
                 "Print PySide2 shared library link flags for qmake"))
 
-options.append(("--shiboken2-module-shared-libraries-qmake",
-                lambda: get_shared_libraries_qmake(Package.shiboken2_module), pyside2_libs_error,
-                "Print paths of shiboken2 shared libraries (.so's, .dylib's, .dll's) for qmake"))
-options.append(("--shiboken2-module-shared-libraries-cmake",
-                lambda: get_shared_libraries_cmake(Package.shiboken2_module), pyside2_libs_error,
-                "Print paths of shiboken2 shared libraries (.so's, .dylib's, .dll's) for cmake"))
+options.append(("--shiboken6-module-shared-libraries-qmake",
+                lambda: get_shared_libraries_qmake(Package.shiboken6_module), pyside2_libs_error,
+                "Print paths of shiboken6 shared libraries (.so's, .dylib's, .dll's) for qmake"))
+options.append(("--shiboken6-module-shared-libraries-cmake",
+                lambda: get_shared_libraries_cmake(Package.shiboken6_module), pyside2_libs_error,
+                "Print paths of shiboken6 shared libraries (.so's, .dylib's, .dll's) for cmake"))
 
 options.append(("--pyside2-shared-libraries-qmake",
                 lambda: get_shared_libraries_qmake(Package.pyside2), pyside2_libs_error,
@@ -111,8 +111,8 @@ for i, (flag, _, _, description) in enumerate(options):
         options_usage += '\n'
 
 usage = """
-Utility to determine include/link options of shiboken2/PySide2 and Python for qmake/CMake projects
-that would like to embed or build custom shiboken2/PySide2 bindings.
+Utility to determine include/link options of shiboken6/PySide2 and Python for qmake/CMake projects
+that would like to embed or build custom shiboken6/PySide2 bindings.
 
 Usage: pyside2_config.py [option]
 Options:
@@ -128,8 +128,8 @@ if option == '-h' or option == '--help':
 
 
 class Package(object):
-    shiboken2_module = 1
-    shiboken2_generator = 2
+    shiboken6_module = 1
+    shiboken6_generator = 2
     pyside2 = 3
 
 
@@ -201,19 +201,19 @@ def find_pyside2():
     return find_package_path("PySide2")
 
 
-def find_shiboken2_module():
-    return find_package_path("shiboken2")
+def find_shiboken6_module():
+    return find_package_path("shiboken6")
 
 
-def find_shiboken2_generator():
-    return find_package_path("shiboken2_generator")
+def find_shiboken6_generator():
+    return find_package_path("shiboken6_generator")
 
 
 def find_package(which_package):
-    if which_package == Package.shiboken2_module:
-        return find_shiboken2_module()
-    if which_package == Package.shiboken2_generator:
-        return find_shiboken2_generator()
+    if which_package == Package.shiboken6_module:
+        return find_shiboken6_module()
+    if which_package == Package.shiboken6_generator:
+        return find_shiboken6_generator()
     if which_package == Package.pyside2:
         return find_pyside2()
     return None
diff --git a/examples/widgetbinding/CMakeLists.txt b/examples/widgetbinding/CMakeLists.txt
index 2966e63b2..4cdfa648e 100644
--- a/examples/widgetbinding/CMakeLists.txt
+++ b/examples/widgetbinding/CMakeLists.txt
@@ -77,17 +77,17 @@ macro(pyside2_config option output_var)
 endmacro()
 
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path shiboken2_module_path)
-pyside2_config(--shiboken2-generator-path shiboken2_generator_path)
+pyside2_config(--shiboken6-module-path shiboken6_module_path)
+pyside2_config(--shiboken6-generator-path shiboken6_generator_path)
 pyside2_config(--pyside2-path pyside2_path)
 pyside2_config(--pyside2-include-path pyside2_include_dir 1)
 pyside2_config(--python-include-path python_include_dir)
-pyside2_config(--shiboken2-generator-include-path shiboken_include_dir 1)
-pyside2_config(--shiboken2-module-shared-libraries-cmake shiboken_shared_libraries 0)
+pyside2_config(--shiboken6-generator-include-path shiboken_include_dir 1)
+pyside2_config(--shiboken6-module-shared-libraries-cmake shiboken_shared_libraries 0)
 pyside2_config(--python-link-flags-cmake python_linking_data 0)
 pyside2_config(--pyside2-shared-libraries-cmake pyside2_shared_libraries 0)
 
-set(shiboken_path "${shiboken2_generator_path}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(shiboken_path "${shiboken6_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 if(NOT EXISTS ${shiboken_path})
     message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}")
 endif()
@@ -103,7 +103,7 @@ endif()
 # Enable rpaths so that the built shared libraries find their dependencies.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${shiboken2_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_INSTALL_RPATH ${shiboken6_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.
diff --git a/setup.py b/setup.py
index 8eb2027b6..c6cd382b5 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ from __future__ import print_function
 """
 This is a distutils setup-script for the Qt for Python project
 
-To build both shiboken2 and PySide2 simply execute:
+To build both shiboken6 and PySide2 simply execute:
 
     python setup.py build
 
@@ -54,8 +54,8 @@ to build and install into your current Python installation.
 
 The same setup.py script is used to build all the components of the
 project:
-  - shiboken2 (the supporting Python module)
-  - shiboken2-generator (the bindings generation executable)
+  - shiboken6 (the supporting Python module)
+  - shiboken6-generator (the bindings generation executable)
   - PySide2
   - pyside2-tools
 
@@ -75,8 +75,8 @@ By default, all of the above is built when no special options are
 passed to the script. You can use the --build-type parameter to specify
 which things should be built:
 
-  --build-type=shiboken2 - build / package only the python module
-  --build-type=shiboken2-generator - build / package the generator
+  --build-type=shiboken6 - build / package only the python module
+  --build-type=shiboken6-generator - build / package the generator
                                      executable
   --build-type=pyside2 - build / package the PySide2 bindings and
                         and pyside2-tools
@@ -84,11 +84,11 @@ which things should be built:
 
 
 When building PySide2, optionally, one can specify the location of the
-shiboken2 cmake config path if it is not on the current PATH with:
+shiboken6 cmake config path if it is not on the current PATH with:
 
      --shiboken-config-dir=/path/to/shiboken/cmake/config/dir
 
-This is useful if you did a cmake installation of shiboken2 into
+This is useful if you did a cmake installation of shiboken6 into
 a custom location.
 
 For Windows, if OpenSSL support is required, it's necessary to specify
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index df605b45a..cd228bf8b 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -11,7 +11,7 @@ set (QT_MAJOR_VERSION 6)
 project(pysidebindings)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_helpers/
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../shiboken2/data/
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../shiboken6/data/
                       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Macros/
                       ${CMAKE_MODULE_PATH})
 include(shiboken_helpers)
@@ -63,7 +63,7 @@ else()
     set(PATH_SEP ":")
 endif()
 
-find_package(Shiboken2 2.0.0 REQUIRED)
+find_package(Shiboken6 2.0.0 REQUIRED)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "${SHIBOKEN_BUILD_TYPE}" CACHE STRING "Build Type")
diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
index 31f0b8343..43ed7a60e 100644
--- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
@@ -62,7 +62,7 @@
          of the `.ui` file.
 
          (Remember that `duck punching virtual methods is an invitation for your own demise!
-         &lt;https://doc.qt.io/qtforpython/shiboken2/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
+         &lt;https://doc.qt.io/qtforpython/shiboken6/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
 
          Let's see an obvious example. If you want to create a new widget it's probable you'll end up
          overriding :class:`~PySide2.QtGui.QWidget`'s :meth:`~PySide2.QtGui.QWidget.paintEvent` method.
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index 035cdd636..89c47ae80 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -11,20 +11,20 @@ __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @B
 
 
 def _additional_dll_directories(package_dir):
-    # Find shiboken2 relative to the package directory.
+    # Find shiboken6 relative to the package directory.
     root = os.path.dirname(package_dir)
     # Check for a flat .zip as deployed by cx_free(PYSIDE-1257)
     if root.endswith('.zip'):
         return []
-    shiboken2 = os.path.join(root, 'shiboken2')
-    if os.path.isdir(shiboken2): # Standard case, only shiboken2 is needed
-        return [shiboken2]
+    shiboken6 = os.path.join(root, 'shiboken6')
+    if os.path.isdir(shiboken6): # Standard case, only shiboken6 is needed
+        return [shiboken6]
     # The below code is for the build process when generate_pyi.py
     # is executed in the build directory. We need libpyside and Qt in addition.
-    shiboken2 = os.path.join(os.path.dirname(root), 'shiboken2', 'libshiboken')
-    if not os.path.isdir(shiboken2):
-        raise ImportError(shiboken2 + ' does not exist')
-    result = [shiboken2, os.path.join(root, 'libpyside')]
+    shiboken6 = os.path.join(os.path.dirname(root), 'shiboken6', 'libshiboken')
+    if not os.path.isdir(shiboken6):
+        raise ImportError(shiboken6 + ' does not exist')
+    result = [shiboken6, os.path.join(root, 'libpyside')]
     for path in os.environ.get('PATH').split(';'):
         if path:
              if os.path.exists(os.path.join(path, 'qmake.exe')):
@@ -34,13 +34,13 @@ def _additional_dll_directories(package_dir):
 
 
 def _setupQtDirectories():
-    # On Windows we need to explicitly import the shiboken2 module so
+    # On Windows we need to explicitly import the shiboken6 module so
     # that the libshiboken.dll dependency is loaded by the time a
     # Qt module is imported. Otherwise due to PATH not containing
-    # the shiboken2 module path, the Qt module import would fail
+    # the shiboken6 module path, the Qt module import would fail
     # due to the missing libshiboken dll.
     # In addition, as of Python 3.8, the shiboken package directory
-    # must be added to the DLL search paths so that shiboken2.dll
+    # must be added to the DLL search paths so that shiboken6.dll
     # is found.
     # We need to do the same on Linux and macOS, because we do not
     # embed rpaths into the PySide2 libraries that would point to
@@ -55,10 +55,10 @@ def _setupQtDirectories():
             os.add_dll_directory(dir)
 
     try:
-        import shiboken2
+        import shiboken6
     except Exception:
         paths = ', '.join(sys.path)
-        print('PySide2/__init__.py: Unable to import shiboken2 from {}'.format(paths),
+        print('PySide2/__init__.py: Unable to import shiboken6 from {}'.format(paths),
               file=sys.stderr)
         raise
 
@@ -73,9 +73,9 @@ def _setupQtDirectories():
             PySide2/__init__.py: The `signature` module was not initialized.
             This libshiboken module was loaded from
 
-            "{shiboken2.__file__}".
+            "{shiboken6.__file__}".
 
-            Please make sure that this is the real shiboken2 binary and not just a folder.
+            Please make sure that this is the real shiboken6 binary and not just a folder.
             {stars}
             ''').format(stars=79*"*", **locals()), file=sys.stderr)
         raise
diff --git a/sources/pyside2/PySide2/support/__init__.py b/sources/pyside2/PySide2/support/__init__.py
index 8764fb5cb..996acb05a 100644
--- a/sources/pyside2/PySide2/support/__init__.py
+++ b/sources/pyside2/PySide2/support/__init__.py
@@ -37,6 +37,6 @@
 ##
 #############################################################################
 
-from shiboken2 import VoidPtr
+from shiboken6 import VoidPtr
 
 #eof
diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py
index d71ee338e..6cca2ebbe 100644
--- a/sources/pyside2/PySide2/support/generate_pyi.py
+++ b/sources/pyside2/PySide2/support/generate_pyi.py
@@ -147,7 +147,7 @@ class Formatter(Writer):
         self.print()
         self.print("class Object(object): pass")
         self.print()
-        self.print("import shiboken2 as Shiboken")
+        self.print("import shiboken6 as Shiboken")
         self.print("Shiboken.Object = Object")
         self.print()
         # This line will be replaced by the missing imports postprocess.
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake
index 5022002c9..bbaeb9ada 100644
--- a/sources/pyside2/cmake/Macros/PySideModules.cmake
+++ b/sources/pyside2/cmake/Macros/PySideModules.cmake
@@ -124,7 +124,7 @@ macro(create_pyside_module)
 
     add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
                         BYPRODUCTS ${${module_SOURCES}}
-                        COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
+                        COMMAND Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
                         --include-paths=${shiboken_include_dirs}
                         ${shiboken_framework_include_dirs_option}
@@ -154,7 +154,7 @@ macro(create_pyside_module)
     endif()
 
     target_link_libraries(${module_NAME} ${${module_LIBRARIES}})
-    target_link_libraries(${module_NAME} Shiboken2::libshiboken)
+    target_link_libraries(${module_NAME} Shiboken6::libshiboken)
     if(${module_DEPS})
         add_dependencies(${module_NAME} ${${module_DEPS}})
     endif()
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt
index 73b90c059..409fde41b 100644
--- a/sources/pyside2/doc/CMakeLists.txt
+++ b/sources/pyside2/doc/CMakeLists.txt
@@ -16,12 +16,12 @@ set(TS_ROOT "${ROOT}/PySide2")
 
 file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf.in)
 
-set(SHIBOKEN_INTERSPHINX_FILE "${ROOT}/pyside2/shiboken2/objects.inv")
+set(SHIBOKEN_INTERSPHINX_FILE "${ROOT}/pyside2/shiboken6/objects.inv")
 set(HAS_WEBENGINE_WIDGETS 0)
 set(SKIP_SPHINX_WARNINGS 1)
 if (FULLDOCSBUILD)
     set(SKIP_SPHINX_WARNINGS 0)
-    set(SHIBOKEN_INTERSPHINX_FILE "${CMAKE_BINARY_DIR}/doc/html/shiboken2/doc/html/objects.inv")
+    set(SHIBOKEN_INTERSPHINX_FILE "${CMAKE_BINARY_DIR}/doc/html/shiboken6/doc/html/objects.inv")
     # For Qt modules that are part of the documentation build:
     #    - Configure the module docconf file
     #    - Write shiboken header consisting of pyside2_global.h and module includes
@@ -131,10 +131,10 @@ add_custom_target(apidoc
 # and generate offline help based on the output format.
 if(DOC_OUTPUT_FORMAT STREQUAL "html")
     add_custom_command(TARGET apidoc POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken2
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken6
             COMMAND ${CMAKE_COMMAND} -E copy_directory
-                    ${CMAKE_CURRENT_BINARY_DIR}/../../shiboken2/doc/html
-                    ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken2
+                    ${CMAKE_CURRENT_BINARY_DIR}/../../shiboken6/doc/html
+                    ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken6
             COMMENT "Copying Shiboken docs..."
             VERBATIM)
 else()
@@ -151,7 +151,7 @@ configure_file("conf.py.in" "rst/conf.py" @ONLY)
 
 add_custom_target("docrsts"
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/rst
-    COMMAND Shiboken2::shiboken2 --generator-set=qtdoc ${docHeader}
+    COMMAND Shiboken6::shiboken6 --generator-set=qtdoc ${docHeader}
             --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${TS_ROOT}"
             --api-version=${SUPPORTED_QT_VERSION}
             --typesystem-paths="${QDOC_TYPESYSTEM_PATH}"
diff --git a/sources/pyside2/doc/conf.py.in b/sources/pyside2/doc/conf.py.in
index ae1bc6455..ff04dcf20 100644
--- a/sources/pyside2/doc/conf.py.in
+++ b/sources/pyside2/doc/conf.py.in
@@ -173,9 +173,9 @@ html_show_sourcelink = False
 # Output file base name for HTML help builder.
 #htmlhelp_basename = 'PySideDoc'
 
-# Link to the shiboken2 sphinx project to enable linking
+# Link to the shiboken6 sphinx project to enable linking
 # between the two projects.
-intersphinx_mapping = {'shiboken2': ('shiboken2','@SHIBOKEN_INTERSPHINX_FILE@')}
+intersphinx_mapping = {'shiboken6': ('shiboken6','@SHIBOKEN_INTERSPHINX_FILE@')}
 
 add_module_names = False
 
diff --git a/sources/pyside2/doc/contents.rst b/sources/pyside2/doc/contents.rst
index 598a65c92..6d0b25fb7 100644
--- a/sources/pyside2/doc/contents.rst
+++ b/sources/pyside2/doc/contents.rst
@@ -14,7 +14,7 @@
     licenses.rst
     modules.rst
     considerations.rst
-    shiboken2/index.rst
+    shiboken6/index.rst
 
 Module Index
 ============
diff --git a/sources/pyside2/doc/deployment-pyinstaller.rst b/sources/pyside2/doc/deployment-pyinstaller.rst
index e7ed643f6..d58ec2d7d 100644
--- a/sources/pyside2/doc/deployment-pyinstaller.rst
+++ b/sources/pyside2/doc/deployment-pyinstaller.rst
@@ -20,7 +20,7 @@ After installation, the `pyinstaller` binary is located in your virtual environm
 directory, or where your Python executable is located. If that directory isn't in your `PATH`,
 include the whole path when you run `pyinstaller`.
 
-.. warning:: If you already have a PySide2 or Shiboken2 version installed in your
+.. warning:: If you already have a PySide2 or Shiboken6 version installed in your
    system path, PyInstaller uses them instead of your virtual environment version.
 
 Freeze an application
@@ -119,7 +119,7 @@ PyInstaller Issue
 -----------------
 
 As mentioned before, if available, `PyInstaller` picks a system installation of PySide2 or
-Shiboken2 instead of your `virtualenv` version without notice. This is negligible if those
+Shiboken6 instead of your `virtualenv` version without notice. This is negligible if those
 two versions are the same.
 
 If you're working with different versions, this can result in frustrating debugging sessions
@@ -144,13 +144,13 @@ Safety Instructions
 -------------------
 
 - When using `PyInstaller` with `virtualenv`, make sure that there is no system
-  installation of PySide2 or shiboken2.
+  installation of PySide2 or shiboken6.
 
-- Before compiling, use `pip -uninstall pyside2 shiboken2 -y` multiple times, until
+- Before compiling, use `pip -uninstall pyside2 shiboken6 -y` multiple times, until
   none of the programs are found anymore.
 
 - Pip is usually a good tool. But to be 100 % sure, you should directly remove
-  the PySide2 and shiboken2 folders from site-packages.
+  the PySide2 and shiboken6 folders from site-packages.
 
 - Be sure to use the right version of pip. The safest way to really run the right
   pip, is to use the Python that you mean: Instead of the pip command, better use::
diff --git a/sources/pyside2/doc/faq.rst b/sources/pyside2/doc/faq.rst
index b7e9816c8..99721141b 100644
--- a/sources/pyside2/doc/faq.rst
+++ b/sources/pyside2/doc/faq.rst
@@ -17,21 +17,21 @@ Frequently Asked Questions
   The project's old wiki page is available on PySide, but the project is now deprecated and not
   supported.
 
-**There are three wheels (pyside2, shiboken2, and shiboken2_generator), what's the difference?**
+**There are three wheels (pyside2, shiboken6, and shiboken6_generator), what's the difference?**
 
   Before the official release, everything was in one big wheel, so it made sense to split these
   into separate wheels, each for the major projects currently in development:
 
    * **pyside2**: contains all the PySide2 modules to use the Qt framework; also depends on the
-     shiboken2 module.
-   * **shiboken2**: contains the shiboken2 module with helper functions for PySide2.
-   * **shiboken2_generator**: contains the generator binary that can work with a C++ project and a
+     shiboken6 module.
+   * **shiboken6**: contains the shiboken6 module with helper functions for PySide2.
+   * **shiboken6_generator**: contains the generator binary that can work with a C++ project and a
      typesystem to generate Python bindings.
      If you want to generate bindings for a Qt/C++ project, there won't be any linking to the Qt
      shared libraries; you need to do this by hand. We recommend building PySide2 from scratch
      to have everything properly linked.
 
-**Why is the shiboken2_generator not installed automatically?**
-  It's not necessary to install the shiboken2_generator to use PySide2. The package is a result of
+**Why is the shiboken6_generator not installed automatically?**
+  It's not necessary to install the shiboken6_generator to use PySide2. The package is a result of
   the wheel splitting process. To use the generator, it's recommended to build it from scratch to
   have the proper Qt linking.
diff --git a/sources/pyside2/doc/gettingstarted.rst b/sources/pyside2/doc/gettingstarted.rst
index 1623538cf..44320b25f 100644
--- a/sources/pyside2/doc/gettingstarted.rst
+++ b/sources/pyside2/doc/gettingstarted.rst
@@ -108,7 +108,7 @@ which will generate a ``html/`` directory with the following structure::
     └── pyside2
         ├── index.html
         ├── ...
-        └── shiboken2
+        └── shiboken6
             ├── index.html
             └── ...
 
@@ -148,7 +148,7 @@ directory, and run::
 
 Finally, you will get a ``html`` directory containing all the generated documentation. The offline
 help files, ``PySide.qch`` and ``Shiboken.qch``, can be moved to any directory of your choice. You
-can find ``Shiboken.qch`` in the build directory, ``*_build\*_release\shiboken2\doc\html``.
+can find ``Shiboken.qch`` in the build directory, ``*_build\*_release\shiboken6\doc\html``.
 
 Viewing offline documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/sources/pyside2/doc/index.rst b/sources/pyside2/doc/index.rst
index 6c62334d5..5a4941afd 100644
--- a/sources/pyside2/doc/index.rst
+++ b/sources/pyside2/doc/index.rst
@@ -7,7 +7,7 @@
     has two main components:
 
     * `PySide2`_, so that you can use Qt5 APIs in your Python applications, and
-    * `Shiboken2 <shiboken2/index.html>`__, a binding generator tool, which can
+    * `Shiboken6 <shiboken6/index.html>`__, a binding generator tool, which can
       be used to expose C++ projects to Python, and a Python module with
       some utility functions.
 
@@ -17,7 +17,7 @@
     has two main components:
 
     * `PySide2`_, so that you can use Qt5 APIs in your Python applications, and
-    * `Shiboken2 <../shiboken2/index.html>`__, a binding generator tool, which can
+    * `Shiboken6 <../shiboken6/index.html>`__, a binding generator tool, which can
       be used to expose C++ projects to Python, and a Python module with
       some utility functions.
 
@@ -57,7 +57,7 @@ Documentation
             <tr>
                 <td><a href="deployment.html" style="display: block;"><p><strong>Deployment</strong><br/>Learn to deploy your apps.</p></a></td>
                 <td><a href="considerations.html" style="display: block;"><p><strong>Considerations</strong><br/>API differences and known issues.</p></a></td>
-                <td><a href="shiboken2/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
+                <td><a href="shiboken6/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
             </tr>
         </table>
 
@@ -86,7 +86,7 @@ Documentation
             <tr>
                 <td><a href="deployment.html" style="display: block;"><p><strong>Deployment</strong><br/>Learn to deploy your apps.</p></a></td>
                 <td><a href="considerations.html" style="display: block;"><p><strong>Considerations</strong><br/>API differences and known issues.</p></a></td>
-                <td><a href="../shiboken2/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
+                <td><a href="../shiboken6/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
             </tr>
         </table>
 
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt
index 5e6ee86ba..579159c6a 100644
--- a/sources/pyside2/libpyside/CMakeLists.txt
+++ b/sources/pyside2/libpyside/CMakeLists.txt
@@ -93,7 +93,7 @@ target_include_directories(pyside2 PUBLIC
 )
 
 target_link_libraries(pyside2
-                      PRIVATE Shiboken2::libshiboken
+                      PRIVATE Shiboken6::libshiboken
                       PRIVATE ${QML_LIBRARIES}
                       PRIVATE ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES})
 
diff --git a/sources/pyside2/libpyside/pyside2.pc.in b/sources/pyside2/libpyside/pyside2.pc.in
index ecbe0bbc8..0653006f3 100644
--- a/sources/pyside2/libpyside/pyside2.pc.in
+++ b/sources/pyside2/libpyside/pyside2.pc.in
@@ -11,5 +11,5 @@ Description: Support library for Python bindings of Qt5-based libraries.
 Version: @BINDING_API_VERSION_FULL@
 Libs: -L${libdir} -lpyside2@pyside2_SUFFIX@@SHIBOKEN_PYTHON_CONFIG_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
 Cflags: -I${includedir}
-Requires: shiboken2
+Requires: shiboken6
 
diff --git a/sources/pyside2/plugins/CMakeLists.txt b/sources/pyside2/plugins/CMakeLists.txt
index 9be985198..1d947fb44 100644
--- a/sources/pyside2/plugins/CMakeLists.txt
+++ b/sources/pyside2/plugins/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(uiplugin
                       Qt::Gui
                       Qt::UiPlugin
                       Qt::Widgets
-                      Shiboken2::libshiboken)
+                      Shiboken6::libshiboken)
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
 else()
diff --git a/sources/pyside2/tests/QtWidgets/qlabel_test.py b/sources/pyside2/tests/QtWidgets/qlabel_test.py
index 19387dee9..322e18b7c 100644
--- a/sources/pyside2/tests/QtWidgets/qlabel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlabel_test.py
@@ -38,7 +38,7 @@ init_test_paths(True)
 
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QLabel
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 from helper.usesqapplication import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
index f1c360b82..851231c42 100644
--- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
@@ -36,7 +36,7 @@ init_test_paths(False)
 
 from PySide2.QtGui import QStandardItemModel, QStandardItem
 from PySide2.QtWidgets import QWidget
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 from helper.usesqapplication import UsesQApplication
 
diff --git a/sources/pyside2/tests/init_paths.py b/sources/pyside2/tests/init_paths.py
index 9cfdebc86..c0a9cd984 100644
--- a/sources/pyside2/tests/init_paths.py
+++ b/sources/pyside2/tests/init_paths.py
@@ -33,7 +33,7 @@ import sys
 
 SRC_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(SRC_DIR)),
-                             'shiboken2', 'tests'))
+                             'shiboken6', 'tests'))
 from shiboken_paths import (get_dir_env_var, get_build_dir, add_python_dirs,
                             add_lib_dirs, shiboken_paths)
 
@@ -68,7 +68,7 @@ def _get_qt_lib_dir():
 
 def _init_test_paths(shiboken_tests=False, testbindings_module=False):
     """Sets the correct import paths (Python modules and C++ library paths)
-       for PySide tests and shiboken2 tests using depending on the environment
+       for PySide tests and shiboken6 tests using depending on the environment
        variables BUILD_DIR and QT_DIR pointing to the build directory and
        Qt directory, respectively."""
     src_dir = os.path.dirname(os.path.abspath(__file__))
@@ -99,6 +99,6 @@ def init_test_paths(testbindings_module=False):
 
 
 def init_all_test_paths():
-    """Sets the correct import paths for PySide2 and shiboken2 tests
+    """Sets the correct import paths for PySide2 and shiboken6 tests
        (for registry checking only)."""
     _init_test_paths(True, True)
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index 361f7d541..e969e13c9 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -68,7 +68,7 @@ endif()
 
 make_path(testbinding_include_dirs  ${pyside2_BINARY_DIR}
                                     ${CMAKE_CURRENT_SOURCE_DIR}
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../../../shiboken2/libshiboken
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/../../../shiboken6/libshiboken
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../PySide2
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../libpyside
                                     ${QT_INCLUDE_DIR}
@@ -83,7 +83,7 @@ make_path(testbinding_typesystem_path ${pyside2_SOURCE_DIR}
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
         BYPRODUCTS ${testbinding_SRC}
-        COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
+        COMMAND Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
         ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h
         --include-paths=${testbinding_include_dirs}
         ${shiboken_framework_include_dirs_option}
@@ -111,7 +111,7 @@ set_target_properties(pysidetest PROPERTIES
                       DEFINE_SYMBOL BUILD_PYSIDETEST)
 
 target_link_libraries(pysidetest
-                      Shiboken2::libshiboken
+                      Shiboken6::libshiboken
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
@@ -134,7 +134,7 @@ target_link_libraries(testbinding
                       pysidetest
                       pyside2
                       ${TESTBINDING_PYTHON_LIBS}
-                      Shiboken2::libshiboken
+                      Shiboken6::libshiboken
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
diff --git a/sources/pyside2/tests/pysidetest/bug_1016.py b/sources/pyside2/tests/pysidetest/bug_1016.py
index 9f035e0e1..234bfe0e5 100644
--- a/sources/pyside2/tests/pysidetest/bug_1016.py
+++ b/sources/pyside2/tests/pysidetest/bug_1016.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from init_paths import init_test_paths
 init_test_paths(True)
 
-import shiboken2
+import shiboken6
 from testbinding import *
 
 class TestBug1016 (unittest.TestCase):
diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py
index e80c3b69f..86548d7e5 100644
--- a/sources/pyside2/tests/registry/init_platform.py
+++ b/sources/pyside2/tests/registry/init_platform.py
@@ -104,7 +104,7 @@ if not os.path.exists(os.path.join(all_build_dir, look_for)):
     sys.exit(1)
 
 pyside_build_dir = os.path.join(all_build_dir, "pyside2")
-shiboken_build_dir = os.path.join(all_build_dir, "shiboken2")
+shiboken_build_dir = os.path.join(all_build_dir, "shiboken6")
 
 # now we compute all paths:
 def set_ospaths(build_dir):
@@ -113,11 +113,11 @@ def set_ospaths(build_dir):
     old_val = os.environ.get(ospath_var, "")
     lib_path = [os.path.join(build_dir, "pyside2", "libpyside"),
                 os.path.join(build_dir, "pyside2", "tests", "pysidetest"),
-                os.path.join(build_dir, "shiboken2", "tests", "libminimal"),
-                os.path.join(build_dir, "shiboken2", "tests", "libsample"),
-                os.path.join(build_dir, "shiboken2", "tests", "libother"),
-                os.path.join(build_dir, "shiboken2", "tests", "libsmart"),
-                os.path.join(build_dir, "shiboken2", "libshiboken")]
+                os.path.join(build_dir, "shiboken6", "tests", "libminimal"),
+                os.path.join(build_dir, "shiboken6", "tests", "libsample"),
+                os.path.join(build_dir, "shiboken6", "tests", "libother"),
+                os.path.join(build_dir, "shiboken6", "tests", "libsmart"),
+                os.path.join(build_dir, "shiboken6", "libshiboken")]
     ospath = ps.join(lib_path + old_val.split(ps))
     os.environ[ospath_var] = ospath
 
@@ -136,9 +136,9 @@ import testbinding
 all_modules.append("testbinding")
 
 # Note: This is not the shiboken dir as usual, but the binary.
-import shiboken2 as Shiboken
+import shiboken6 as Shiboken
 Shiboken.__name__ = "Shiboken"
-sys.modules["Shiboken"] = sys.modules.pop("shiboken2")
+sys.modules["Shiboken"] = sys.modules.pop("shiboken6")
 all_modules.append("Shiboken")
 
 # 'sample/smart' are needed by 'other', so import them first.
diff --git a/sources/pyside2/tests/registry/scrape_testresults.py b/sources/pyside2/tests/registry/scrape_testresults.py
index c5c0e8689..e0f451d10 100644
--- a/sources/pyside2/tests/registry/scrape_testresults.py
+++ b/sources/pyside2/tests/registry/scrape_testresults.py
@@ -344,7 +344,7 @@ if __name__ == "__main__":
             Enforces evaluation when a scan did not complete yet.
 
             For more information, see the file
-                sources/shiboken2/libshiboken/signature_doc.rst
+                sources/shiboken6/libshiboken/signature_doc.rst
             """))
     subparsers = parser.add_subparsers(dest="command", metavar="", title="required argument")
     # create the parser for the "scan" command
diff --git a/sources/pyside2/tests/support/voidptr_test.py b/sources/pyside2/tests/support/voidptr_test.py
index 367d250da..2b7b713f9 100644
--- a/sources/pyside2/tests/support/voidptr_test.py
+++ b/sources/pyside2/tests/support/voidptr_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 from PySide2.support import VoidPtr
 from PySide2.QtCore import QByteArray
 
diff --git a/sources/shiboken2/data/CMakeLists.txt b/sources/shiboken2/data/CMakeLists.txt
deleted file mode 100644
index e7ce95456..000000000
--- a/sources/shiboken2/data/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
-else()
-    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
-endif()
-
-add_custom_target(data)
-add_dependencies(data shiboken2)
-get_target_property(SHIBOKEN_GENERATOR shiboken2 OUTPUT_NAME)
-
-include(CMakePackageConfigHelpers)
-
-# Build-tree / super project package config file.
-set(SHIBOKEN_PYTHON_MODULE_DIR "${shiboken2_BINARY_DIR}/shibokenmodule")
-set(SHIBOKEN_SHARED_LIBRARY_DIR "${shiboken2_BINARY_DIR}/libshiboken")
-
-configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2Config-spec.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake"
-     INSTALL_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
-     PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
-     INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
-)
-
-# Install-tree / relocatable package config file.
-set(SHIBOKEN_PYTHON_MODULE_DIR "${PYTHON_SITE_PACKAGES}/shiboken2")
-if (WIN32)
-    set(SHIBOKEN_SHARED_LIBRARY_DIR "${BIN_INSTALL_DIR}")
-else()
-    set(SHIBOKEN_SHARED_LIBRARY_DIR "${LIB_INSTALL_DIR}")
-endif()
-
-configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2Config-spec.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake"
-     INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}"
-     PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
-)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2Config.cmake.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2ConfigVersion.cmake.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2ConfigVersion.cmake" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken2.pc.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/shiboken2${shiboken2_SUFFIX}.pc" @ONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake"
-        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake"
-        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2ConfigVersion.cmake"
-        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
-
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/shiboken_helpers.cmake"
-        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken2${shiboken2_SUFFIX}.pc"
-        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-
diff --git a/sources/shiboken2/.gitattributes b/sources/shiboken6/.gitattributes
index adbe833c1..adbe833c1 100644
--- a/sources/shiboken2/.gitattributes
+++ b/sources/shiboken6/.gitattributes
diff --git a/sources/shiboken2/.gitignore b/sources/shiboken6/.gitignore
index adb1e4594..adb1e4594 100644
--- a/sources/shiboken2/.gitignore
+++ b/sources/shiboken6/.gitignore
diff --git a/sources/shiboken2/AUTHORS b/sources/shiboken6/AUTHORS
index 4bb16b2dd..4bb16b2dd 100644
--- a/sources/shiboken2/AUTHORS
+++ b/sources/shiboken6/AUTHORS
diff --git a/sources/shiboken2/ApiExtractor/AUTHORS b/sources/shiboken6/ApiExtractor/AUTHORS
index 6e802fb53..6e802fb53 100644
--- a/sources/shiboken2/ApiExtractor/AUTHORS
+++ b/sources/shiboken6/ApiExtractor/AUTHORS
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken6/ApiExtractor/CMakeLists.txt
index e1b1f64e4..e1b1f64e4 100644
--- a/sources/shiboken2/ApiExtractor/CMakeLists.txt
+++ b/sources/shiboken6/ApiExtractor/CMakeLists.txt
diff --git a/sources/shiboken2/ApiExtractor/COPYING b/sources/shiboken6/ApiExtractor/COPYING
index 4ccd71466..4ccd71466 100644
--- a/sources/shiboken2/ApiExtractor/COPYING
+++ b/sources/shiboken6/ApiExtractor/COPYING
diff --git a/sources/shiboken2/ApiExtractor/abstractmetaargument.cpp b/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp
index 366fc00a1..366fc00a1 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetaargument.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp
diff --git a/sources/shiboken2/ApiExtractor/abstractmetaargument.h b/sources/shiboken6/ApiExtractor/abstractmetaargument.h
index b5fe22db7..b5fe22db7 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetaargument.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetaargument.h
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index b6e68bfde..b6e68bfde 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder.h
index 09c49b4fb..09c49b4fb 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.h
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
index 1854b8b56..1854b8b56 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
index d88775356..d88775356 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h
index 9c52182ef..9c52182ef 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h b/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h
index c32a49348..c32a49348 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h
diff --git a/sources/shiboken2/ApiExtractor/abstractmetatype.cpp b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
index 5d4375f23..5d4375f23 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
diff --git a/sources/shiboken2/ApiExtractor/abstractmetatype.h b/sources/shiboken6/ApiExtractor/abstractmetatype.h
index c92a7652a..c92a7652a 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetatype.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetatype.h
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp
index aa552cdd3..aa552cdd3 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.h b/sources/shiboken6/ApiExtractor/apiextractor.h
index 9c79ae7a5..9c79ae7a5 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.h
+++ b/sources/shiboken6/ApiExtractor/apiextractor.h
diff --git a/sources/shiboken2/ApiExtractor/apiextractormacros.h b/sources/shiboken6/ApiExtractor/apiextractormacros.h
index 026cd5a9e..026cd5a9e 100644
--- a/sources/shiboken2/ApiExtractor/apiextractormacros.h
+++ b/sources/shiboken6/ApiExtractor/apiextractormacros.h
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
index dd0aca407..dd0aca407 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.h b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.h
index dc37dff0f..dc37dff0f 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.h
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangdebugutils.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp
index 7123c22d8..7123c22d8 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangdebugutils.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangdebugutils.h b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.h
index ae3840fb4..ae3840fb4 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangdebugutils.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.h
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangparser.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp
index d27c87828..d27c87828 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangparser.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangparser.h b/sources/shiboken6/ApiExtractor/clangparser/clangparser.h
index 7e918263a..7e918263a 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangparser.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangparser.h
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
index f3d45faa7..f3d45faa7 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
index fba10206c..fba10206c 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp
index 659324f8c..659324f8c 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.h b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.h
index d9e213e73..d9e213e73 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.h
diff --git a/sources/shiboken2/ApiExtractor/cmake_uninstall.cmake b/sources/shiboken6/ApiExtractor/cmake_uninstall.cmake
index df95fb9d8..df95fb9d8 100644
--- a/sources/shiboken2/ApiExtractor/cmake_uninstall.cmake
+++ b/sources/shiboken6/ApiExtractor/cmake_uninstall.cmake
diff --git a/sources/shiboken2/ApiExtractor/dependency.h b/sources/shiboken6/ApiExtractor/dependency.h
index 7168ea3bc..7168ea3bc 100644
--- a/sources/shiboken2/ApiExtractor/dependency.h
+++ b/sources/shiboken6/ApiExtractor/dependency.h
diff --git a/sources/shiboken2/ApiExtractor/docparser.cpp b/sources/shiboken6/ApiExtractor/docparser.cpp
index cb5d85074..cb5d85074 100644
--- a/sources/shiboken2/ApiExtractor/docparser.cpp
+++ b/sources/shiboken6/ApiExtractor/docparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/docparser.h b/sources/shiboken6/ApiExtractor/docparser.h
index 1dccae4d6..1dccae4d6 100644
--- a/sources/shiboken2/ApiExtractor/docparser.h
+++ b/sources/shiboken6/ApiExtractor/docparser.h
diff --git a/sources/shiboken2/ApiExtractor/documentation.cpp b/sources/shiboken6/ApiExtractor/documentation.cpp
index c042b3b8a..c042b3b8a 100644
--- a/sources/shiboken2/ApiExtractor/documentation.cpp
+++ b/sources/shiboken6/ApiExtractor/documentation.cpp
diff --git a/sources/shiboken2/ApiExtractor/documentation.h b/sources/shiboken6/ApiExtractor/documentation.h
index b0083c2be..b0083c2be 100644
--- a/sources/shiboken2/ApiExtractor/documentation.h
+++ b/sources/shiboken6/ApiExtractor/documentation.h
diff --git a/sources/shiboken2/ApiExtractor/doxygenparser.cpp b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
index 01b8fc012..01b8fc012 100644
--- a/sources/shiboken2/ApiExtractor/doxygenparser.cpp
+++ b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/doxygenparser.h b/sources/shiboken6/ApiExtractor/doxygenparser.h
index ada64ac18..ada64ac18 100644
--- a/sources/shiboken2/ApiExtractor/doxygenparser.h
+++ b/sources/shiboken6/ApiExtractor/doxygenparser.h
diff --git a/sources/shiboken2/ApiExtractor/fileout.cpp b/sources/shiboken6/ApiExtractor/fileout.cpp
index 10b9747ab..10b9747ab 100644
--- a/sources/shiboken2/ApiExtractor/fileout.cpp
+++ b/sources/shiboken6/ApiExtractor/fileout.cpp
diff --git a/sources/shiboken2/ApiExtractor/fileout.h b/sources/shiboken6/ApiExtractor/fileout.h
index b1011c4d6..b1011c4d6 100644
--- a/sources/shiboken2/ApiExtractor/fileout.h
+++ b/sources/shiboken6/ApiExtractor/fileout.h
diff --git a/sources/shiboken2/ApiExtractor/graph.cpp b/sources/shiboken6/ApiExtractor/graph.cpp
index ccc9119b8..ccc9119b8 100644
--- a/sources/shiboken2/ApiExtractor/graph.cpp
+++ b/sources/shiboken6/ApiExtractor/graph.cpp
diff --git a/sources/shiboken2/ApiExtractor/graph.h b/sources/shiboken6/ApiExtractor/graph.h
index ba28986d1..ba28986d1 100644
--- a/sources/shiboken2/ApiExtractor/graph.h
+++ b/sources/shiboken6/ApiExtractor/graph.h
diff --git a/sources/shiboken2/ApiExtractor/header_paths.h b/sources/shiboken6/ApiExtractor/header_paths.h
index c9b5144c8..c9b5144c8 100644
--- a/sources/shiboken2/ApiExtractor/header_paths.h
+++ b/sources/shiboken6/ApiExtractor/header_paths.h
diff --git a/sources/shiboken2/ApiExtractor/icecc.cmake b/sources/shiboken6/ApiExtractor/icecc.cmake
index b2bf071aa..b2bf071aa 100644
--- a/sources/shiboken2/ApiExtractor/icecc.cmake
+++ b/sources/shiboken6/ApiExtractor/icecc.cmake
diff --git a/sources/shiboken2/ApiExtractor/include.cpp b/sources/shiboken6/ApiExtractor/include.cpp
index 6c2cce3a9..6c2cce3a9 100644
--- a/sources/shiboken2/ApiExtractor/include.cpp
+++ b/sources/shiboken6/ApiExtractor/include.cpp
diff --git a/sources/shiboken2/ApiExtractor/include.h b/sources/shiboken6/ApiExtractor/include.h
index 2219fba55..2219fba55 100644
--- a/sources/shiboken2/ApiExtractor/include.h
+++ b/sources/shiboken6/ApiExtractor/include.h
diff --git a/sources/shiboken2/ApiExtractor/merge.xsl b/sources/shiboken6/ApiExtractor/merge.xsl
index c6cab5a42..c6cab5a42 100644
--- a/sources/shiboken2/ApiExtractor/merge.xsl
+++ b/sources/shiboken6/ApiExtractor/merge.xsl
diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken6/ApiExtractor/messages.cpp
index ab03a0102..ab03a0102 100644
--- a/sources/shiboken2/ApiExtractor/messages.cpp
+++ b/sources/shiboken6/ApiExtractor/messages.cpp
diff --git a/sources/shiboken2/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h
index 1e58a7fad..1e58a7fad 100644
--- a/sources/shiboken2/ApiExtractor/messages.h
+++ b/sources/shiboken6/ApiExtractor/messages.h
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
index 76ce333ed..76ce333ed 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken6/ApiExtractor/parser/codemodel.h
index 13bc7cf36..13bc7cf36 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.h
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h b/sources/shiboken6/ApiExtractor/parser/codemodel_enums.h
index aebd59879..aebd59879 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel_enums.h
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel_fwd.h b/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h
index 87fea5cde..87fea5cde 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel_fwd.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h
diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp b/sources/shiboken6/ApiExtractor/parser/enumvalue.cpp
index 513bb3532..513bb3532 100644
--- a/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/enumvalue.cpp
diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.h b/sources/shiboken6/ApiExtractor/parser/enumvalue.h
index ea30c39bb..ea30c39bb 100644
--- a/sources/shiboken2/ApiExtractor/parser/enumvalue.h
+++ b/sources/shiboken6/ApiExtractor/parser/enumvalue.h
diff --git a/sources/shiboken2/ApiExtractor/propertyspec.cpp b/sources/shiboken6/ApiExtractor/propertyspec.cpp
index d15647fda..d15647fda 100644
--- a/sources/shiboken2/ApiExtractor/propertyspec.cpp
+++ b/sources/shiboken6/ApiExtractor/propertyspec.cpp
diff --git a/sources/shiboken2/ApiExtractor/propertyspec.h b/sources/shiboken6/ApiExtractor/propertyspec.h
index d26f7e826..d26f7e826 100644
--- a/sources/shiboken2/ApiExtractor/propertyspec.h
+++ b/sources/shiboken6/ApiExtractor/propertyspec.h
diff --git a/sources/shiboken2/ApiExtractor/qtcompat.h b/sources/shiboken6/ApiExtractor/qtcompat.h
index 89a1db008..89a1db008 100644
--- a/sources/shiboken2/ApiExtractor/qtcompat.h
+++ b/sources/shiboken6/ApiExtractor/qtcompat.h
diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
index 6df37fa51..6df37fa51 100644
--- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.h b/sources/shiboken6/ApiExtractor/qtdocparser.h
index b01139de6..b01139de6 100644
--- a/sources/shiboken2/ApiExtractor/qtdocparser.h
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.h
diff --git a/sources/shiboken2/ApiExtractor/reporthandler.cpp b/sources/shiboken6/ApiExtractor/reporthandler.cpp
index f0c5bf31e..f0c5bf31e 100644
--- a/sources/shiboken2/ApiExtractor/reporthandler.cpp
+++ b/sources/shiboken6/ApiExtractor/reporthandler.cpp
diff --git a/sources/shiboken2/ApiExtractor/reporthandler.h b/sources/shiboken6/ApiExtractor/reporthandler.h
index 21f0e8933..21f0e8933 100644
--- a/sources/shiboken2/ApiExtractor/reporthandler.h
+++ b/sources/shiboken6/ApiExtractor/reporthandler.h
diff --git a/sources/shiboken2/ApiExtractor/sourcelocation.cpp b/sources/shiboken6/ApiExtractor/sourcelocation.cpp
index 1ba66e05b..1ba66e05b 100644
--- a/sources/shiboken2/ApiExtractor/sourcelocation.cpp
+++ b/sources/shiboken6/ApiExtractor/sourcelocation.cpp
diff --git a/sources/shiboken2/ApiExtractor/sourcelocation.h b/sources/shiboken6/ApiExtractor/sourcelocation.h
index 630a841d8..630a841d8 100644
--- a/sources/shiboken2/ApiExtractor/sourcelocation.h
+++ b/sources/shiboken6/ApiExtractor/sourcelocation.h
diff --git a/sources/shiboken2/ApiExtractor/symbols.filter b/sources/shiboken6/ApiExtractor/symbols.filter
index af6c744dd..af6c744dd 100644
--- a/sources/shiboken2/ApiExtractor/symbols.filter
+++ b/sources/shiboken6/ApiExtractor/symbols.filter
diff --git a/sources/shiboken2/ApiExtractor/tests/CMakeLists.txt b/sources/shiboken6/ApiExtractor/tests/CMakeLists.txt
index 97ae0f850..97ae0f850 100644
--- a/sources/shiboken2/ApiExtractor/tests/CMakeLists.txt
+++ b/sources/shiboken6/ApiExtractor/tests/CMakeLists.txt
diff --git a/sources/shiboken2/ApiExtractor/tests/a.xml b/sources/shiboken6/ApiExtractor/tests/a.xml
index 3c09d3800..3c09d3800 100644
--- a/sources/shiboken2/ApiExtractor/tests/a.xml
+++ b/sources/shiboken6/ApiExtractor/tests/a.xml
diff --git a/sources/shiboken2/ApiExtractor/tests/injectedcode.txt b/sources/shiboken6/ApiExtractor/tests/injectedcode.txt
index 872898810..872898810 100644
--- a/sources/shiboken2/ApiExtractor/tests/injectedcode.txt
+++ b/sources/shiboken6/ApiExtractor/tests/injectedcode.txt
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
index c33296885..c33296885 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h
index 1d9f8d8f6..1d9f8d8f6 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.h
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetatype.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
index 6fd25bc0b..6fd25bc0b 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetatype.h b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h
index b39a27a54..b39a27a54 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetatype.h
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
index 51088a040..51088a040 100644
--- a/sources/shiboken2/ApiExtractor/tests/testaddfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testaddfunction.h b/sources/shiboken6/ApiExtractor/tests/testaddfunction.h
index d95f0ecfe..d95f0ecfe 100644
--- a/sources/shiboken2/ApiExtractor/tests/testaddfunction.h
+++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
index 1804ec61e..1804ec61e 100644
--- a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testarrayargument.h b/sources/shiboken6/ApiExtractor/tests/testarrayargument.h
index 2e58ae6ee..2e58ae6ee 100644
--- a/sources/shiboken2/ApiExtractor/tests/testarrayargument.h
+++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
index eed35552e..eed35552e 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h
index 1ac873970..1ac873970 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.h
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.qrc
index fd7616bd2..fd7616bd2 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcodeinjection.qrc
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.qrc
diff --git a/sources/shiboken2/ApiExtractor/tests/testcontainer.cpp b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp
index 3c33c7d1e..3c33c7d1e 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcontainer.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testcontainer.h b/sources/shiboken6/ApiExtractor/tests/testcontainer.h
index 44e6636aa..44e6636aa 100644
--- a/sources/shiboken2/ApiExtractor/tests/testcontainer.h
+++ b/sources/shiboken6/ApiExtractor/tests/testcontainer.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testconversionoperator.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp
index 8e4eebcb5..8e4eebcb5 100644
--- a/sources/shiboken2/ApiExtractor/tests/testconversionoperator.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testconversionoperator.h b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h
index b571a57a0..b571a57a0 100644
--- a/sources/shiboken2/ApiExtractor/tests/testconversionoperator.h
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testconversionruletag.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
index 15a9231ff..15a9231ff 100644
--- a/sources/shiboken2/ApiExtractor/tests/testconversionruletag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testconversionruletag.h b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h
index 894bd3d71..894bd3d71 100644
--- a/sources/shiboken2/ApiExtractor/tests/testconversionruletag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testctorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp
index 7718d3df6..7718d3df6 100644
--- a/sources/shiboken2/ApiExtractor/tests/testctorinformation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testctorinformation.h b/sources/shiboken6/ApiExtractor/tests/testctorinformation.h
index ee655d450..ee655d450 100644
--- a/sources/shiboken2/ApiExtractor/tests/testctorinformation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testctorinformation.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testdroptypeentries.cpp b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
index 786c3717e..786c3717e 100644
--- a/sources/shiboken2/ApiExtractor/tests/testdroptypeentries.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testdroptypeentries.h b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h
index 3023a1120..3023a1120 100644
--- a/sources/shiboken2/ApiExtractor/tests/testdroptypeentries.h
+++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testdtorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp
index 0eee8af24..0eee8af24 100644
--- a/sources/shiboken2/ApiExtractor/tests/testdtorinformation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testdtorinformation.h b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h
index 0a57dd8d1..0a57dd8d1 100644
--- a/sources/shiboken2/ApiExtractor/tests/testdtorinformation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testenum.cpp b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
index cc5f93ad5..cc5f93ad5 100644
--- a/sources/shiboken2/ApiExtractor/tests/testenum.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testenum.h b/sources/shiboken6/ApiExtractor/tests/testenum.h
index 312551763..312551763 100644
--- a/sources/shiboken2/ApiExtractor/tests/testenum.h
+++ b/sources/shiboken6/ApiExtractor/tests/testenum.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testextrainclude.cpp b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
index 565f157e1..565f157e1 100644
--- a/sources/shiboken2/ApiExtractor/tests/testextrainclude.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testextrainclude.h b/sources/shiboken6/ApiExtractor/tests/testextrainclude.h
index 33c5377c7..33c5377c7 100644
--- a/sources/shiboken2/ApiExtractor/tests/testextrainclude.h
+++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testfunctiontag.cpp b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
index b942ea9b5..b942ea9b5 100644
--- a/sources/shiboken2/ApiExtractor/tests/testfunctiontag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testfunctiontag.h b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h
index d68499cd9..d68499cd9 100644
--- a/sources/shiboken2/ApiExtractor/tests/testfunctiontag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
index 309314445..309314445 100644
--- a/sources/shiboken2/ApiExtractor/tests/testimplicitconversions.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testimplicitconversions.h b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h
index da8ae4597..da8ae4597 100644
--- a/sources/shiboken2/ApiExtractor/tests/testimplicitconversions.h
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testinserttemplate.cpp b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
index 13cbaf2d8..13cbaf2d8 100644
--- a/sources/shiboken2/ApiExtractor/tests/testinserttemplate.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testinserttemplate.h b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h
index 99b171933..99b171933 100644
--- a/sources/shiboken2/ApiExtractor/tests/testinserttemplate.h
+++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
index 6acac41d5..6acac41d5 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.h b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h
index 6428a5697..6428a5697 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.qrc b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.qrc
index 76b1bfc61..76b1bfc61 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.qrc
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.qrc
diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
index d88ad5397..d88ad5397 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.h b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h
index 375111e03..375111e03 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testmultipleinheritance.cpp b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp
index a4e506e8c..a4e506e8c 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmultipleinheritance.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testmultipleinheritance.h b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h
index 5ee8a21ea..5ee8a21ea 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmultipleinheritance.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testnamespace.cpp b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp
index e3aad6b50..e3aad6b50 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnamespace.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testnamespace.h b/sources/shiboken6/ApiExtractor/tests/testnamespace.h
index 5153a28a3..5153a28a3 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnamespace.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testnestedtypes.cpp b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
index 43d4b2f33..43d4b2f33 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnestedtypes.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testnestedtypes.h b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h
index a870511ff..a870511ff 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnestedtypes.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
index f6f930679..f6f930679 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.h b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h
index e4e051077..e4e051077 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testprimitivetypetag.cpp b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp
index e78f9f274..e78f9f274 100644
--- a/sources/shiboken2/ApiExtractor/tests/testprimitivetypetag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testprimitivetypetag.h b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h
index ee5f5159f..ee5f5159f 100644
--- a/sources/shiboken2/ApiExtractor/tests/testprimitivetypetag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testrefcounttag.cpp b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp
index 9d1dcc1ae..9d1dcc1ae 100644
--- a/sources/shiboken2/ApiExtractor/tests/testrefcounttag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testrefcounttag.h b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h
index 4acbddcfc..4acbddcfc 100644
--- a/sources/shiboken2/ApiExtractor/tests/testrefcounttag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
index 545c47c61..545c47c61 100644
--- a/sources/shiboken2/ApiExtractor/tests/testreferencetopointer.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testreferencetopointer.h b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h
index 0f717b55d..0f717b55d 100644
--- a/sources/shiboken2/ApiExtractor/tests/testreferencetopointer.h
+++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testremovefield.cpp b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp
index dd9b735a4..dd9b735a4 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremovefield.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testremovefield.h b/sources/shiboken6/ApiExtractor/tests/testremovefield.h
index 8b52cc32f..8b52cc32f 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremovefield.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testremoveimplconv.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
index 2ae6b105f..2ae6b105f 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremoveimplconv.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testremoveimplconv.h b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h
index 9e96dc2e9..9e96dc2e9 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremoveimplconv.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testremoveoperatormethod.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp
index a6d28ccf5..a6d28ccf5 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremoveoperatormethod.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testremoveoperatormethod.h b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h
index 23c3e5144..23c3e5144 100644
--- a/sources/shiboken2/ApiExtractor/tests/testremoveoperatormethod.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testresolvetype.cpp b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
index 2203f3648..2203f3648 100644
--- a/sources/shiboken2/ApiExtractor/tests/testresolvetype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testresolvetype.h b/sources/shiboken6/ApiExtractor/tests/testresolvetype.h
index 62c08bcd7..62c08bcd7 100644
--- a/sources/shiboken2/ApiExtractor/tests/testresolvetype.h
+++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testreverseoperators.cpp b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
index 496b55aaa..496b55aaa 100644
--- a/sources/shiboken2/ApiExtractor/tests/testreverseoperators.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testreverseoperators.h b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h
index ba3b43cfb..ba3b43cfb 100644
--- a/sources/shiboken2/ApiExtractor/tests/testreverseoperators.h
+++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
index 807768236..807768236 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.h b/sources/shiboken6/ApiExtractor/tests/testtemplates.h
index c96e7fe4a..c96e7fe4a 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtemplates.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testtoposort.cpp b/sources/shiboken6/ApiExtractor/tests/testtoposort.cpp
index 25eb99e50..25eb99e50 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtoposort.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtoposort.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testtoposort.h b/sources/shiboken6/ApiExtractor/tests/testtoposort.h
index 7caafc87f..7caafc87f 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtoposort.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtoposort.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testtyperevision.cpp b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp
index 10bf35d59..10bf35d59 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtyperevision.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testtyperevision.h b/sources/shiboken6/ApiExtractor/tests/testtyperevision.h
index 3832c3883..3832c3883 100644
--- a/sources/shiboken2/ApiExtractor/tests/testtyperevision.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtyperevision.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testutil.h b/sources/shiboken6/ApiExtractor/tests/testutil.h
index e24e54365..e24e54365 100644
--- a/sources/shiboken2/ApiExtractor/tests/testutil.h
+++ b/sources/shiboken6/ApiExtractor/tests/testutil.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testvaluetypedefaultctortag.cpp b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
index 1850025d6..1850025d6 100644
--- a/sources/shiboken2/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testvaluetypedefaultctortag.h b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h
index 244181707..244181707 100644
--- a/sources/shiboken2/ApiExtractor/tests/testvaluetypedefaultctortag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h
diff --git a/sources/shiboken2/ApiExtractor/tests/testvoidarg.cpp b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
index 68681550f..68681550f 100644
--- a/sources/shiboken2/ApiExtractor/tests/testvoidarg.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
diff --git a/sources/shiboken2/ApiExtractor/tests/testvoidarg.h b/sources/shiboken6/ApiExtractor/tests/testvoidarg.h
index 44d90d075..44d90d075 100644
--- a/sources/shiboken2/ApiExtractor/tests/testvoidarg.h
+++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.h
diff --git a/sources/shiboken2/ApiExtractor/tests/utf8code.txt b/sources/shiboken6/ApiExtractor/tests/utf8code.txt
index 6d5fa9dcf..6d5fa9dcf 100644
--- a/sources/shiboken2/ApiExtractor/tests/utf8code.txt
+++ b/sources/shiboken6/ApiExtractor/tests/utf8code.txt
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index 6b56d362e..6b56d362e 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.h b/sources/shiboken6/ApiExtractor/typedatabase.h
index fff301c6e..fff301c6e 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase.h
diff --git a/sources/shiboken2/ApiExtractor/typedatabase_typedefs.h b/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h
index f9e6c669e..f9e6c669e 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h
diff --git a/sources/shiboken2/ApiExtractor/typeparser.cpp b/sources/shiboken6/ApiExtractor/typeparser.cpp
index c440fb66d..c440fb66d 100644
--- a/sources/shiboken2/ApiExtractor/typeparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typeparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/typeparser.h b/sources/shiboken6/ApiExtractor/typeparser.h
index 3b538017a..3b538017a 100644
--- a/sources/shiboken2/ApiExtractor/typeparser.h
+++ b/sources/shiboken6/ApiExtractor/typeparser.h
diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp
index 0c84cc980..0c84cc980 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystem.cpp
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken6/ApiExtractor/typesystem.h
index 2bbaabc91..2bbaabc91 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken6/ApiExtractor/typesystem.h
diff --git a/sources/shiboken2/ApiExtractor/typesystem_enums.h b/sources/shiboken6/ApiExtractor/typesystem_enums.h
index 0d7f279c4..0d7f279c4 100644
--- a/sources/shiboken2/ApiExtractor/typesystem_enums.h
+++ b/sources/shiboken6/ApiExtractor/typesystem_enums.h
diff --git a/sources/shiboken2/ApiExtractor/typesystem_typedefs.h b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
index 73f92b294..73f92b294 100644
--- a/sources/shiboken2/ApiExtractor/typesystem_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
index 7b018cd4e..7b018cd4e 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.h b/sources/shiboken6/ApiExtractor/typesystemparser.h
index 130d8d3d2..130d8d3d2 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.h
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.h
diff --git a/sources/shiboken2/ApiExtractor/xmlutils.cpp b/sources/shiboken6/ApiExtractor/xmlutils.cpp
index 6edca2fa5..6edca2fa5 100644
--- a/sources/shiboken2/ApiExtractor/xmlutils.cpp
+++ b/sources/shiboken6/ApiExtractor/xmlutils.cpp
diff --git a/sources/shiboken2/ApiExtractor/xmlutils.h b/sources/shiboken6/ApiExtractor/xmlutils.h
index 879b7757a..879b7757a 100644
--- a/sources/shiboken2/ApiExtractor/xmlutils.h
+++ b/sources/shiboken6/ApiExtractor/xmlutils.h
diff --git a/sources/shiboken2/ApiExtractor/xmlutils_libxslt.cpp b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp
index e1e185130..e1e185130 100644
--- a/sources/shiboken2/ApiExtractor/xmlutils_libxslt.cpp
+++ b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp
diff --git a/sources/shiboken2/ApiExtractor/xmlutils_libxslt.h b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.h
index c32b3901d..c32b3901d 100644
--- a/sources/shiboken2/ApiExtractor/xmlutils_libxslt.h
+++ b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.h
diff --git a/sources/shiboken2/ApiExtractor/xmlutils_qt.h b/sources/shiboken6/ApiExtractor/xmlutils_qt.h
index a9c9adfa2..a9c9adfa2 100644
--- a/sources/shiboken2/ApiExtractor/xmlutils_qt.h
+++ b/sources/shiboken6/ApiExtractor/xmlutils_qt.h
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken6/CMakeLists.txt
index 80e9e3ee9..698128a23 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken6/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_policy(VERSION 3.16)
 
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Build Type")
 
-project(shiboken2)
+project(shiboken6)
 include(CheckIncludeFileCXX)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_helpers/")
@@ -15,7 +15,7 @@ include(helpers)
 include(shiboken_helpers)
 
 option(BUILD_TESTS "Build tests." TRUE)
-option(USE_PYTHON_VERSION "Use specific python version to build shiboken2." "")
+option(USE_PYTHON_VERSION "Use specific python version to build shiboken6." "")
 option(DISABLE_DOCSTRINGS "Disable documentation extraction." FALSE)
 
 set (QT_MAJOR_VERSION 6)
@@ -60,10 +60,10 @@ list(GET SHIBOKEN_VERSION_OUTPUT 3 shiboken_PRE_RELEASE_VERSION_TYPE)
 # the number of the pre release (alpha1, beta3, rc7, etc.)
 list(GET SHIBOKEN_VERSION_OUTPUT 4 shiboken_PRE_RELEASE_VERSION)
 
-set(shiboken2_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}")
-set(shiboken2_library_so_version "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
+set(shiboken6_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}")
+set(shiboken6_library_so_version "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
 
-compute_config_py_values(shiboken2_VERSION)
+compute_config_py_values(shiboken6_VERSION)
 
 ## For debugging the PYTHON* variables
 message(STATUS "PYTHONLIBS_FOUND:       " ${PYTHONLIBS_FOUND})
@@ -216,7 +216,7 @@ if (Qt${QT_MAJOR_VERSION}Core_FOUND AND PYTHONINTERP_FOUND)
         add_subdirectory(tests)
     endif()
 else()
-    message(WARNING "Some dependencies were not found: shiboken2 generator compilation disabled!")
+    message(WARNING "Some dependencies were not found: shiboken6 generator compilation disabled!")
 endif()
 
 add_subdirectory(data)
diff --git a/sources/shiboken2/COPYING b/sources/shiboken6/COPYING
index 4ccd71466..4ccd71466 100644
--- a/sources/shiboken2/COPYING
+++ b/sources/shiboken6/COPYING
diff --git a/sources/shiboken2/COPYING.libsample b/sources/shiboken6/COPYING.libsample
index 9315102f7..9315102f7 100644
--- a/sources/shiboken2/COPYING.libsample
+++ b/sources/shiboken6/COPYING.libsample
diff --git a/sources/shiboken2/COPYING.libshiboken b/sources/shiboken6/COPYING.libshiboken
index 9315102f7..9315102f7 100644
--- a/sources/shiboken2/COPYING.libshiboken
+++ b/sources/shiboken6/COPYING.libshiboken
diff --git a/sources/shiboken2/Doxyfile b/sources/shiboken6/Doxyfile
index 9be56a0e4..9be56a0e4 100644
--- a/sources/shiboken2/Doxyfile
+++ b/sources/shiboken6/Doxyfile
diff --git a/sources/shiboken2/cmake_uninstall.cmake b/sources/shiboken6/cmake_uninstall.cmake
index df95fb9d8..df95fb9d8 100644
--- a/sources/shiboken2/cmake_uninstall.cmake
+++ b/sources/shiboken6/cmake_uninstall.cmake
diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt
new file mode 100644
index 000000000..46bd1bfa9
--- /dev/null
+++ b/sources/shiboken6/data/CMakeLists.txt
@@ -0,0 +1,61 @@
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
+else()
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
+endif()
+
+add_custom_target(data)
+add_dependencies(data shiboken6)
+get_target_property(SHIBOKEN_GENERATOR shiboken6 OUTPUT_NAME)
+
+include(CMakePackageConfigHelpers)
+
+# Build-tree / super project package config file.
+set(SHIBOKEN_PYTHON_MODULE_DIR "${shiboken6_BINARY_DIR}/shibokenmodule")
+set(SHIBOKEN_SHARED_LIBRARY_DIR "${shiboken6_BINARY_DIR}/libshiboken")
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config-spec.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
+     INSTALL_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
+     PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
+     INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
+)
+
+# Install-tree / relocatable package config file.
+set(SHIBOKEN_PYTHON_MODULE_DIR "${PYTHON_SITE_PACKAGES}/shiboken6")
+if (WIN32)
+    set(SHIBOKEN_SHARED_LIBRARY_DIR "${BIN_INSTALL_DIR}")
+else()
+    set(SHIBOKEN_SHARED_LIBRARY_DIR "${LIB_INSTALL_DIR}")
+endif()
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config-spec.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
+     INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}"
+     PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
+)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6ConfigVersion.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6ConfigVersion.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" @ONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake"
+        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
+        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6ConfigVersion.cmake"
+        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/shiboken_helpers.cmake"
+        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc"
+        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+
diff --git a/sources/shiboken2/data/GeneratorRunnerConfig.cmake.in b/sources/shiboken6/data/GeneratorRunnerConfig.cmake.in
index cf973e2a6..cf973e2a6 100644
--- a/sources/shiboken2/data/GeneratorRunnerConfig.cmake.in
+++ b/sources/shiboken6/data/GeneratorRunnerConfig.cmake.in
diff --git a/sources/shiboken2/data/GeneratorRunnerConfigVersion.cmake.in b/sources/shiboken6/data/GeneratorRunnerConfigVersion.cmake.in
index 8eb5ba479..8eb5ba479 100644
--- a/sources/shiboken2/data/GeneratorRunnerConfigVersion.cmake.in
+++ b/sources/shiboken6/data/GeneratorRunnerConfigVersion.cmake.in
diff --git a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in b/sources/shiboken6/data/Shiboken6Config-spec.cmake.in
index db8373806..172ea479e 100644
--- a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in
+++ b/sources/shiboken6/data/Shiboken6Config-spec.cmake.in
@@ -12,8 +12,8 @@ set(SHIBOKEN_PYTHON_LIMITED_API "@PYTHON_LIMITED_API@")
 
 # Import targets and call variable set up functions  only when using an installed shiboken config
 # file (so not during a regular shiboken build, or during a super project build).
-if (NOT TARGET Shiboken2::shiboken2)
-    include("${CMAKE_CURRENT_LIST_DIR}/Shiboken2Targets.cmake")
+if (NOT TARGET Shiboken6::shiboken6)
+    include("${CMAKE_CURRENT_LIST_DIR}/Shiboken6Targets.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/shiboken_helpers.cmake")
 
     # Compute the python include and libraries path if needed (aka not part of super project build).
@@ -32,7 +32,7 @@ get_property(SHIBOKEN_PYTHON_INTERPRETER GLOBAL PROPERTY SHIBOKEN_PYTHON_INTERPR
 set(SHIBOKEN_PYTHON_EXTENSION_SUFFIX "@PYTHON_EXTENSION_SUFFIX@")
 set(SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX "@PYTHON_SHARED_LIBRARY_SUFFIX@")
 set(SHIBOKEN_PYTHON_CONFIG_SUFFIX "@PYTHON_CONFIG_SUFFIX@")
-set(SHIBOKEN_SO_VERSION "@shiboken2_library_so_version@")
+set(SHIBOKEN_SO_VERSION "@shiboken6_library_so_version@")
 set(SHIBOKEN_BUILD_TYPE "@SHIBOKEN_BUILD_TYPE@")
 
 set_and_check(SHIBOKEN_PYTHON_MODULE_DIR "@PACKAGE_SHIBOKEN_PYTHON_MODULE_DIR@")
diff --git a/sources/shiboken2/data/Shiboken2Config.cmake.in b/sources/shiboken6/data/Shiboken6Config.cmake.in
index e13bd2a12..d818eb4c9 100644
--- a/sources/shiboken2/data/Shiboken2Config.cmake.in
+++ b/sources/shiboken6/data/Shiboken6Config.cmake.in
@@ -1,5 +1,5 @@
 if (NOT PYTHON_CONFIG_SUFFIX)
-    message(STATUS "Shiboken2Config: Using default python: @PYTHON_CONFIG_SUFFIX@")
+    message(STATUS "Shiboken6Config: Using default python: @PYTHON_CONFIG_SUFFIX@")
     SET(PYTHON_CONFIG_SUFFIX @PYTHON_CONFIG_SUFFIX@)
 endif()
-include("${CMAKE_CURRENT_LIST_DIR}/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake")
diff --git a/sources/shiboken2/data/Shiboken2ConfigVersion.cmake.in b/sources/shiboken6/data/Shiboken6ConfigVersion.cmake.in
index 9460099b2..3990e9dad 100644
--- a/sources/shiboken2/data/Shiboken2ConfigVersion.cmake.in
+++ b/sources/shiboken6/data/Shiboken6ConfigVersion.cmake.in
@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION @shiboken2_VERSION@)
+set(PACKAGE_VERSION @shiboken6_VERSION@)
 
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
diff --git a/sources/shiboken2/data/docgenerator.1 b/sources/shiboken6/data/docgenerator.1
index c65282f98..c65282f98 120000
--- a/sources/shiboken2/data/docgenerator.1
+++ b/sources/shiboken6/data/docgenerator.1
diff --git a/sources/shiboken2/data/generatorrunner.1 b/sources/shiboken6/data/generatorrunner.1
index f5a61f139..f5a61f139 100644
--- a/sources/shiboken2/data/generatorrunner.1
+++ b/sources/shiboken6/data/generatorrunner.1
diff --git a/sources/shiboken2/data/generatorrunner.pc.in b/sources/shiboken6/data/generatorrunner.pc.in
index a566f4356..a566f4356 100644
--- a/sources/shiboken2/data/generatorrunner.pc.in
+++ b/sources/shiboken6/data/generatorrunner.pc.in
diff --git a/sources/shiboken2/data/shiboken2.pc.in b/sources/shiboken6/data/shiboken6.pc.in
index 10db59e1e..2ff841840 100644
--- a/sources/shiboken2/data/shiboken2.pc.in
+++ b/sources/shiboken6/data/shiboken6.pc.in
@@ -1,13 +1,13 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
-includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken2
+includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken6
 generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@
 python_interpreter=@PYTHON_EXECUTABLE@
 python_include_dir=@PYTHON_INCLUDE_DIRS@
 
-Name: shiboken2
-Description: Support library for Python bindings created with the Shiboken2 generator.
-Version: @shiboken2_VERSION@
-Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken2@shiboken2_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
-Cflags: -I@PYTHON_INCLUDE_DIRS@ -I${includedir}/@shiboken2_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
+Name: shiboken6
+Description: Support library for Python bindings created with the Shiboken6 generator.
+Version: @shiboken6_VERSION@
+Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken6@shiboken6_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
+Cflags: -I@PYTHON_INCLUDE_DIRS@ -I${includedir}/@shiboken6_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
diff --git a/sources/shiboken2/data/shiboken_helpers.cmake b/sources/shiboken6/data/shiboken_helpers.cmake
index 9cb9f9514..f363bbb73 100644
--- a/sources/shiboken2/data/shiboken_helpers.cmake
+++ b/sources/shiboken6/data/shiboken_helpers.cmake
@@ -18,7 +18,7 @@ macro(set_debug_build)
     endif()
 
     if(NOT PYTHON_WITH_DEBUG)
-        message(WARNING "Compiling shiboken2 with debug enabled, \
+        message(WARNING "Compiling shiboken6 with debug enabled, \
             but the python executable was not compiled with debug support.")
     else()
         set(SBK_PKG_CONFIG_PY_DEBUG_DEFINITION " -DPy_DEBUG")
@@ -37,7 +37,7 @@ macro(setup_sanitize_address)
     # so that proper sanitizer symbols are linked in.
     #
     # Note that when running tests, you may need to set an additional environment variable
-    # in set_tests_properties for shiboken2 / pyside tests, or exported in your shell. Address
+    # in set_tests_properties for shiboken6 / pyside tests, or exported in your shell. Address
     # sanitizer will tell you what environment variable needs to be exported. For example:
     # export DYLD_INSERT_LIBRARIES=/Applications/Xcode.app/Contents/Developer/Toolchains/
     #   ./XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib
@@ -255,7 +255,7 @@ macro(shiboken_compute_python_includes)
     # build) append the include dirs as PUBLIC.
     if (SHIBOKEN_COMPUTE_INCLUDES_IS_CALLED_FROM_EXPORT)
         #TODO target_include_directories works on imported targets only starting with v3.11.0.
-        set_property(TARGET Shiboken2::libshiboken
+        set_property(TARGET Shiboken6::libshiboken
                      APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PYTHON_INCLUDE_DIRS})
     else()
         target_include_directories(libshiboken
@@ -349,7 +349,7 @@ macro(shiboken_compute_python_libraries)
     # build) append the libraries as PUBLIC.
     if (SHIBOKEN_COMPUTE_LIBS_IS_CALLED_FROM_EXPORT)
         #TODO target_link_libraries works on imported targets only starting with v3.11.0.
-        set_property(TARGET Shiboken2::libshiboken
+        set_property(TARGET Shiboken6::libshiboken
                      APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${SHIBOKEN_PYTHON_LIBRARIES})
     else()
         target_link_libraries(libshiboken
diff --git a/sources/shiboken2/doc/CMakeLists.txt b/sources/shiboken6/doc/CMakeLists.txt
index 5f59bfbf0..46195417e 100644
--- a/sources/shiboken2/doc/CMakeLists.txt
+++ b/sources/shiboken6/doc/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 if(FULLDOCSBUILD EQUAL 0)
-    project(shiboken2_doc)
+    project(shiboken6_doc)
 endif()
 find_program(SPHINX sphinx-build DOC "Path to sphinx-build binary.")
 
@@ -25,7 +25,7 @@ try:
 \t\t\tcontinue
 \t\tmatch=re.match('(^.*virtualFolder.)doc(.*$)',line)
 \t\tif match:
-\t\t\trepl=''.join([match.group(1),'shiboken2',match.group(2)])
+\t\t\trepl=''.join([match.group(1),'shiboken6',match.group(2)])
 \t\t\tprint(line.replace(match.group(0),repl),end=' ')
 \t\telse:
 \t\t\tprint(line)
diff --git a/sources/shiboken2/doc/README.md b/sources/shiboken6/doc/README.md
index 2575eafd2..2575eafd2 100644
--- a/sources/shiboken2/doc/README.md
+++ b/sources/shiboken6/doc/README.md
diff --git a/sources/shiboken2/doc/_templates/index.html b/sources/shiboken6/doc/_templates/index.html
index 00ac64271..00ac64271 100644
--- a/sources/shiboken2/doc/_templates/index.html
+++ b/sources/shiboken6/doc/_templates/index.html
diff --git a/sources/shiboken2/doc/_templates/layout.html b/sources/shiboken6/doc/_templates/layout.html
index 2e2e9e892..2e2e9e892 100644
--- a/sources/shiboken2/doc/_templates/layout.html
+++ b/sources/shiboken6/doc/_templates/layout.html
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/searchbox.html b/sources/shiboken6/doc/_themes/pysidedocs/searchbox.html
index 55a972156..55a972156 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/searchbox.html
+++ b/sources/shiboken6/doc/_themes/pysidedocs/searchbox.html
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/bg_header.png b/sources/shiboken6/doc/_themes/pysidedocs/static/bg_header.png
index 843e7e2c5..843e7e2c5 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/bg_header.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/bg_header.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/bg_topo.jpg b/sources/shiboken6/doc/_themes/pysidedocs/static/bg_topo.jpg
index 4229ae8db..4229ae8db 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/bg_topo.jpg
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/bg_topo.jpg
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/fakebar.png b/sources/shiboken6/doc/_themes/pysidedocs/static/fakebar.png
index b45830e00..b45830e00 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/fakebar.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/fakebar.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/logo_python.jpg b/sources/shiboken6/doc/_themes/pysidedocs/static/logo_python.jpg
index cd474efba..cd474efba 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/logo_python.jpg
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/logo_python.jpg
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/logo_qt.png b/sources/shiboken6/doc/_themes/pysidedocs/static/logo_qt.png
index 39a4a26f3..39a4a26f3 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/logo_qt.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/logo_qt.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/pyside.css b/sources/shiboken6/doc/_themes/pysidedocs/static/pyside.css
index f6a1c5ae4..f6a1c5ae4 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/pyside.css
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/pyside.css
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/pysidelogo.png b/sources/shiboken6/doc/_themes/pysidedocs/static/pysidelogo.png
index 3a2f2bd17..3a2f2bd17 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/pysidelogo.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/pysidelogo.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/static/relbar_bg.png b/sources/shiboken6/doc/_themes/pysidedocs/static/relbar_bg.png
index 4036733a7..4036733a7 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/static/relbar_bg.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs/static/relbar_bg.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs/theme.conf b/sources/shiboken6/doc/_themes/pysidedocs/theme.conf
index 01a4dd4a1..01a4dd4a1 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs/theme.conf
+++ b/sources/shiboken6/doc/_themes/pysidedocs/theme.conf
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/domainindex.html b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/domainindex.html
index c136cdd1c..c136cdd1c 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/domainindex.html
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/domainindex.html
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/fakebar.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/fakebar.png
index b45830e00..b45830e00 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/fakebar.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/fakebar.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/logo_python.jpg b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/logo_python.jpg
index cd474efba..cd474efba 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/logo_python.jpg
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/logo_python.jpg
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/logo_qt.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/logo_qt.png
index 3bc03b7c7..3bc03b7c7 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/logo_qt.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/logo_qt.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/minus.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/minus.png
index da1c5620d..da1c5620d 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/minus.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/minus.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/plus.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/plus.png
index b3cb37425..b3cb37425 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/plus.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/plus.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/pyside.css b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/pyside.css
index aee5e4420..aee5e4420 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/pyside.css
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/pyside.css
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/pysidelogo.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/pysidelogo.png
index 3a2f2bd17..3a2f2bd17 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/pysidelogo.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/pysidelogo.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/relbar_bg.png b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/relbar_bg.png
index 4036733a7..4036733a7 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/static/relbar_bg.png
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/static/relbar_bg.png
diff --git a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/theme.conf b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/theme.conf
index 4384b459c..4384b459c 100644
--- a/sources/shiboken2/doc/_themes/pysidedocs_qthelp/theme.conf
+++ b/sources/shiboken6/doc/_themes/pysidedocs_qthelp/theme.conf
diff --git a/sources/shiboken2/doc/conf.py.in b/sources/shiboken6/doc/conf.py.in
index f99af0fff..f99af0fff 100644
--- a/sources/shiboken2/doc/conf.py.in
+++ b/sources/shiboken6/doc/conf.py.in
diff --git a/sources/shiboken2/doc/considerations.rst b/sources/shiboken6/doc/considerations.rst
index 3488c3407..3488c3407 100644
--- a/sources/shiboken2/doc/considerations.rst
+++ b/sources/shiboken6/doc/considerations.rst
diff --git a/sources/shiboken2/doc/dependency-pyside.svg b/sources/shiboken6/doc/dependency-pyside.svg
index 786bdb8a6..786bdb8a6 100644
--- a/sources/shiboken2/doc/dependency-pyside.svg
+++ b/sources/shiboken6/doc/dependency-pyside.svg
diff --git a/sources/shiboken2/doc/examples/index.rst b/sources/shiboken6/doc/examples/index.rst
index 92a64195e..92a64195e 100644
--- a/sources/shiboken2/doc/examples/index.rst
+++ b/sources/shiboken6/doc/examples/index.rst
diff --git a/sources/shiboken2/doc/examples/samplebinding.rst b/sources/shiboken6/doc/examples/samplebinding.rst
index a53b32bac..a53b32bac 100644
--- a/sources/shiboken2/doc/examples/samplebinding.rst
+++ b/sources/shiboken6/doc/examples/samplebinding.rst
diff --git a/sources/shiboken2/doc/gettingstarted.rst b/sources/shiboken6/doc/gettingstarted.rst
index 321db9545..758bc9763 100644
--- a/sources/shiboken2/doc/gettingstarted.rst
+++ b/sources/shiboken6/doc/gettingstarted.rst
@@ -13,7 +13,7 @@ General Requirements
 
  * **Python**: 3.5+ and 2.7
  * **Qt:** 5.12+ (5.15 is recommended)
- * **libclang:** The libclang library, recommended: version 10 for Shiboken2 5.15.
+ * **libclang:** The libclang library, recommended: version 10 for Shiboken6 5.15.
    Prebuilt versions of it can be `downloaded here`_.
  * **CMake:** 3.1+ is needed.
 
@@ -24,20 +24,20 @@ Simple build
 
 If you need only Shiboken Generator, a simple build run would look like this::
 
-    # For the required libraries (this will also build the shiboken2 python module)
+    # For the required libraries (this will also build the shiboken6 python module)
     python setup.py install --qmake=/path/to/qmake \
                             --build-tests \
                             --verbose-build \
-                            --internal-build-type=shiboken2
+                            --internal-build-type=shiboken6
 
     # For the executable
     python setup.py install --qmake=/path/to/qmake \
                             --build-tests \
                             --verbose-build \
-                            --internal-build-type=shiboken2-generator
+                            --internal-build-type=shiboken6-generator
 
 The same can be used for the module, changing the value of ``internal-build-type`` to
-``shiboken2-module``.
+``shiboken6-module``.
 
 .. warning:: If you are planning to use PySide too, for examples like
     'scriptableapplication' you need to have build it as well.  The main issue is
@@ -47,16 +47,16 @@ The same can be used for the module, changing the value of ``internal-build-type
 Using the wheels
 ----------------
 
-Installing ``pyside2`` or ``shiboken2`` from pip **does not** install ``shiboken2_generator``,
+Installing ``pyside2`` or ``shiboken6`` from pip **does not** install ``shiboken6_generator``,
 because the wheels are not on PyPi.
 
-You can get the ``shiboken2_generator`` wheels from Qt servers, and you can still install it
+You can get the ``shiboken6_generator`` wheels from Qt servers, and you can still install it
 via ``pip``::
 
     pip install \
         --index-url=http://download.qt.io/official_releases/QtForPython/ \
         --trusted-host download.qt.io \
-        shiboken2 pyside2 shiboken2_generator
+        shiboken6 pyside2 shiboken6_generator
 
 
 The ``whl`` package cannot automatically discover in your system the location for:
diff --git a/sources/shiboken2/doc/images/.directory b/sources/shiboken6/doc/images/.directory
index e65475f65..e65475f65 100644
--- a/sources/shiboken2/doc/images/.directory
+++ b/sources/shiboken6/doc/images/.directory
diff --git a/sources/shiboken2/doc/images/bindinggen-development.png b/sources/shiboken6/doc/images/bindinggen-development.png
index 5931b126a..5931b126a 100644
--- a/sources/shiboken2/doc/images/bindinggen-development.png
+++ b/sources/shiboken6/doc/images/bindinggen-development.png
diff --git a/sources/shiboken2/doc/images/bindinggen-development.svg b/sources/shiboken6/doc/images/bindinggen-development.svg
index 591e1f2d1..591e1f2d1 100644
--- a/sources/shiboken2/doc/images/bindinggen-development.svg
+++ b/sources/shiboken6/doc/images/bindinggen-development.svg
diff --git a/sources/shiboken2/doc/images/boostgen.png b/sources/shiboken6/doc/images/boostgen.png
index ae9d9fc3d..ae9d9fc3d 100644
--- a/sources/shiboken2/doc/images/boostgen.png
+++ b/sources/shiboken6/doc/images/boostgen.png
diff --git a/sources/shiboken2/doc/images/converter.png b/sources/shiboken6/doc/images/converter.png
index cd52e2769..cd52e2769 100644
--- a/sources/shiboken2/doc/images/converter.png
+++ b/sources/shiboken6/doc/images/converter.png
diff --git a/sources/shiboken2/doc/images/converter.svg b/sources/shiboken6/doc/images/converter.svg
index 4305eb720..4305eb720 100644
--- a/sources/shiboken2/doc/images/converter.svg
+++ b/sources/shiboken6/doc/images/converter.svg
diff --git a/sources/shiboken2/doc/images/genrunnerarch.png b/sources/shiboken6/doc/images/genrunnerarch.png
index db1077cd0..db1077cd0 100644
--- a/sources/shiboken2/doc/images/genrunnerarch.png
+++ b/sources/shiboken6/doc/images/genrunnerarch.png
diff --git a/sources/shiboken2/doc/images/genrunnerarch.svg b/sources/shiboken6/doc/images/genrunnerarch.svg
index ea7eb73e7..ea7eb73e7 100644
--- a/sources/shiboken2/doc/images/genrunnerarch.svg
+++ b/sources/shiboken6/doc/images/genrunnerarch.svg
diff --git a/sources/shiboken2/doc/images/icecream.png b/sources/shiboken6/doc/images/icecream.png
index 41d1a25fa..41d1a25fa 100644
--- a/sources/shiboken2/doc/images/icecream.png
+++ b/sources/shiboken6/doc/images/icecream.png
diff --git a/sources/shiboken2/doc/images/qtforpython-underthehood.png b/sources/shiboken6/doc/images/qtforpython-underthehood.png
index 64e30b1c5..64e30b1c5 100644
--- a/sources/shiboken2/doc/images/qtforpython-underthehood.png
+++ b/sources/shiboken6/doc/images/qtforpython-underthehood.png
diff --git a/sources/shiboken2/doc/images/shibokenqtarch.png b/sources/shiboken6/doc/images/shibokenqtarch.png
index 359413373..359413373 100644
--- a/sources/shiboken2/doc/images/shibokenqtarch.png
+++ b/sources/shiboken6/doc/images/shibokenqtarch.png
diff --git a/sources/shiboken2/doc/images/shibokenqtarch.svg b/sources/shiboken6/doc/images/shibokenqtarch.svg
index d9212f18c..d9212f18c 100644
--- a/sources/shiboken2/doc/images/shibokenqtarch.svg
+++ b/sources/shiboken6/doc/images/shibokenqtarch.svg
diff --git a/sources/shiboken2/doc/index.rst b/sources/shiboken6/doc/index.rst
index ebde8d1ff..ebde8d1ff 100644
--- a/sources/shiboken2/doc/index.rst
+++ b/sources/shiboken6/doc/index.rst
diff --git a/sources/shiboken2/doc/shibokengenerator.rst b/sources/shiboken6/doc/shibokengenerator.rst
index c3000ac09..c3000ac09 100644
--- a/sources/shiboken2/doc/shibokengenerator.rst
+++ b/sources/shiboken6/doc/shibokengenerator.rst
diff --git a/sources/shiboken2/doc/shibokenmodule.rst b/sources/shiboken6/doc/shibokenmodule.rst
index 150998ccd..150998ccd 100644
--- a/sources/shiboken2/doc/shibokenmodule.rst
+++ b/sources/shiboken6/doc/shibokenmodule.rst
diff --git a/sources/shiboken2/doc/typesystem.rst b/sources/shiboken6/doc/typesystem.rst
index 0d43cec2c..0d43cec2c 100644
--- a/sources/shiboken2/doc/typesystem.rst
+++ b/sources/shiboken6/doc/typesystem.rst
diff --git a/sources/shiboken2/doc/typesystem_arguments.rst b/sources/shiboken6/doc/typesystem_arguments.rst
index bce0914e3..bce0914e3 100644
--- a/sources/shiboken2/doc/typesystem_arguments.rst
+++ b/sources/shiboken6/doc/typesystem_arguments.rst
diff --git a/sources/shiboken2/doc/typesystem_codegeneration.rst b/sources/shiboken6/doc/typesystem_codegeneration.rst
index fb41e28e1..fb41e28e1 100644
--- a/sources/shiboken2/doc/typesystem_codegeneration.rst
+++ b/sources/shiboken6/doc/typesystem_codegeneration.rst
diff --git a/sources/shiboken2/doc/typesystem_codeinjection.rst b/sources/shiboken6/doc/typesystem_codeinjection.rst
index b0d5f3851..b0d5f3851 100644
--- a/sources/shiboken2/doc/typesystem_codeinjection.rst
+++ b/sources/shiboken6/doc/typesystem_codeinjection.rst
diff --git a/sources/shiboken2/doc/typesystem_conversionrule.rst b/sources/shiboken6/doc/typesystem_conversionrule.rst
index 27e7a72de..27e7a72de 100644
--- a/sources/shiboken2/doc/typesystem_conversionrule.rst
+++ b/sources/shiboken6/doc/typesystem_conversionrule.rst
diff --git a/sources/shiboken2/doc/typesystem_converters.rst b/sources/shiboken6/doc/typesystem_converters.rst
index 872daa187..872daa187 100644
--- a/sources/shiboken2/doc/typesystem_converters.rst
+++ b/sources/shiboken6/doc/typesystem_converters.rst
diff --git a/sources/shiboken2/doc/typesystem_documentation.rst b/sources/shiboken6/doc/typesystem_documentation.rst
index d73e43cb1..d73e43cb1 100644
--- a/sources/shiboken2/doc/typesystem_documentation.rst
+++ b/sources/shiboken6/doc/typesystem_documentation.rst
diff --git a/sources/shiboken2/doc/typesystem_manipulating_objects.rst b/sources/shiboken6/doc/typesystem_manipulating_objects.rst
index d87b816a3..d87b816a3 100644
--- a/sources/shiboken2/doc/typesystem_manipulating_objects.rst
+++ b/sources/shiboken6/doc/typesystem_manipulating_objects.rst
diff --git a/sources/shiboken2/doc/typesystem_modify_function.rst b/sources/shiboken6/doc/typesystem_modify_function.rst
index 071cea4f5..071cea4f5 100644
--- a/sources/shiboken2/doc/typesystem_modify_function.rst
+++ b/sources/shiboken6/doc/typesystem_modify_function.rst
diff --git a/sources/shiboken2/doc/typesystem_ownership.rst b/sources/shiboken6/doc/typesystem_ownership.rst
index a2ee8e1fa..a2ee8e1fa 100644
--- a/sources/shiboken2/doc/typesystem_ownership.rst
+++ b/sources/shiboken6/doc/typesystem_ownership.rst
diff --git a/sources/shiboken2/doc/typesystem_sequenceprotocol.rst b/sources/shiboken6/doc/typesystem_sequenceprotocol.rst
index 742be3d70..742be3d70 100644
--- a/sources/shiboken2/doc/typesystem_sequenceprotocol.rst
+++ b/sources/shiboken6/doc/typesystem_sequenceprotocol.rst
diff --git a/sources/shiboken2/doc/typesystem_solving_compilation.rst b/sources/shiboken6/doc/typesystem_solving_compilation.rst
index 23ab9012d..23ab9012d 100644
--- a/sources/shiboken2/doc/typesystem_solving_compilation.rst
+++ b/sources/shiboken6/doc/typesystem_solving_compilation.rst
diff --git a/sources/shiboken2/doc/typesystem_specifying_types.rst b/sources/shiboken6/doc/typesystem_specifying_types.rst
index 405469ea2..405469ea2 100644
--- a/sources/shiboken2/doc/typesystem_specifying_types.rst
+++ b/sources/shiboken6/doc/typesystem_specifying_types.rst
diff --git a/sources/shiboken2/doc/typesystem_templates.rst b/sources/shiboken6/doc/typesystem_templates.rst
index 31b155c5a..31b155c5a 100644
--- a/sources/shiboken2/doc/typesystem_templates.rst
+++ b/sources/shiboken6/doc/typesystem_templates.rst
diff --git a/sources/shiboken2/doc/typesystem_variables.rst b/sources/shiboken6/doc/typesystem_variables.rst
index 73d4dd12c..73d4dd12c 100644
--- a/sources/shiboken2/doc/typesystem_variables.rst
+++ b/sources/shiboken6/doc/typesystem_variables.rst
diff --git a/sources/shiboken2/generator/CMakeLists.txt b/sources/shiboken6/generator/CMakeLists.txt
index b0db0d8b0..a625969dd 100644
--- a/sources/shiboken2/generator/CMakeLists.txt
+++ b/sources/shiboken6/generator/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(shibokengenerator)
 
-set(shiboken2_SRC
+set(shiboken6_SRC
 generator.cpp
 shiboken/cppgenerator.cpp
 shiboken/headergenerator.cpp
@@ -9,30 +9,30 @@ shiboken/shibokengenerator.cpp
 main.cpp
 )
 
-add_executable(shiboken2 ${shiboken2_SRC})
-add_executable(Shiboken2::shiboken2 ALIAS shiboken2)
-add_dependencies(shiboken2 apiextractor)
-set_target_properties(shiboken2 PROPERTIES OUTPUT_NAME shiboken2${shiboken2_SUFFIX})
-target_include_directories(shiboken2 PRIVATE
+add_executable(shiboken6 ${shiboken6_SRC})
+add_executable(Shiboken6::shiboken6 ALIAS shiboken6)
+add_dependencies(shiboken6 apiextractor)
+set_target_properties(shiboken6 PROPERTIES OUTPUT_NAME shiboken6${shiboken6_SUFFIX})
+target_include_directories(shiboken6 PRIVATE
                     ${CMAKE_CURRENT_SOURCE_DIR}/shiboken
                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
                     ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
                     ${apiextractor_SOURCE_DIR}
                     )
-target_link_libraries(shiboken2 apiextractor Qt${QT_MAJOR_VERSION}::Core)
+target_link_libraries(shiboken6 apiextractor Qt${QT_MAJOR_VERSION}::Core)
 if (NOT DISABLE_DOCSTRINGS)
-    target_sources(shiboken2 PRIVATE qtdoc/qtdocgenerator.cpp)
-    target_compile_definitions(shiboken2 PUBLIC DOCSTRINGS_ENABLED)
+    target_sources(shiboken6 PRIVATE qtdoc/qtdocgenerator.cpp)
+    target_compile_definitions(shiboken6 PUBLIC DOCSTRINGS_ENABLED)
 endif()
 
 configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
 
-install(TARGETS shiboken2
-        EXPORT Shiboken2Targets
+install(TARGETS shiboken6
+        EXPORT Shiboken6Targets
         DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 
-set(shiboken_generator_package_name "shiboken2_generator")
+set(shiboken_generator_package_name "shiboken6_generator")
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in"
                "${CMAKE_CURRENT_BINARY_DIR}/_config.py" @ONLY)
@@ -44,7 +44,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in"
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
        DESTINATION "${PYTHON_SITE_PACKAGES}/${shiboken_generator_package_name}")
 
-# shiboken2 setuptools entry point
+# shiboken6 setuptools entry point
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../shiboken_tool.py
         DESTINATION bin
         PERMISSIONS
diff --git a/sources/shiboken2/generator/__init__.py.in b/sources/shiboken6/generator/__init__.py.in
index 4be6a833b..4be6a833b 100644
--- a/sources/shiboken2/generator/__init__.py.in
+++ b/sources/shiboken6/generator/__init__.py.in
diff --git a/sources/shiboken2/generator/_config.py.in b/sources/shiboken6/generator/_config.py.in
index 985735fa4..985735fa4 100644
--- a/sources/shiboken2/generator/_config.py.in
+++ b/sources/shiboken6/generator/_config.py.in
diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp
index 72a5b9a2e..72a5b9a2e 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken6/generator/generator.cpp
diff --git a/sources/shiboken2/generator/generator.h b/sources/shiboken6/generator/generator.h
index 90470100e..90470100e 100644
--- a/sources/shiboken2/generator/generator.h
+++ b/sources/shiboken6/generator/generator.h
diff --git a/sources/shiboken2/generator/indentor.h b/sources/shiboken6/generator/indentor.h
index 3dcec85b6..3dcec85b6 100644
--- a/sources/shiboken2/generator/indentor.h
+++ b/sources/shiboken6/generator/indentor.h
diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken6/generator/main.cpp
index 3c5c5876c..3c5c5876c 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken6/generator/main.cpp
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
index 53b403022..53b403022 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
index 70f6c7c26..70f6c7c26 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
diff --git a/sources/shiboken2/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index 1d7649b18..1d7649b18 100644
--- a/sources/shiboken2/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index 25d4b22db..25d4b22db 100644
--- a/sources/shiboken2/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
diff --git a/sources/shiboken2/generator/shiboken/ctypenames.h b/sources/shiboken6/generator/shiboken/ctypenames.h
index abac261d5..abac261d5 100644
--- a/sources/shiboken2/generator/shiboken/ctypenames.h
+++ b/sources/shiboken6/generator/shiboken/ctypenames.h
diff --git a/sources/shiboken2/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp
index d607ed643..d607ed643 100644
--- a/sources/shiboken2/generator/shiboken/headergenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken/headergenerator.h b/sources/shiboken6/generator/shiboken/headergenerator.h
index d02516b8d..d02516b8d 100644
--- a/sources/shiboken2/generator/shiboken/headergenerator.h
+++ b/sources/shiboken6/generator/shiboken/headergenerator.h
diff --git a/sources/shiboken2/generator/shiboken/overloaddata.cpp b/sources/shiboken6/generator/shiboken/overloaddata.cpp
index 53fff9f25..53fff9f25 100644
--- a/sources/shiboken2/generator/shiboken/overloaddata.cpp
+++ b/sources/shiboken6/generator/shiboken/overloaddata.cpp
diff --git a/sources/shiboken2/generator/shiboken/overloaddata.h b/sources/shiboken6/generator/shiboken/overloaddata.h
index 2507c3213..2507c3213 100644
--- a/sources/shiboken2/generator/shiboken/overloaddata.h
+++ b/sources/shiboken6/generator/shiboken/overloaddata.h
diff --git a/sources/shiboken2/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
index 5382b3a9f..5382b3a9f 100644
--- a/sources/shiboken2/generator/shiboken/shibokengenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
diff --git a/sources/shiboken2/generator/shiboken/shibokengenerator.h b/sources/shiboken6/generator/shiboken/shibokengenerator.h
index 0d49764ab..0d49764ab 100644
--- a/sources/shiboken2/generator/shiboken/shibokengenerator.h
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.h
diff --git a/sources/shiboken2/generator/shibokenconfig.h.in b/sources/shiboken6/generator/shibokenconfig.h.in
index 2c86a4a3c..848bad372 100644
--- a/sources/shiboken2/generator/shibokenconfig.h.in
+++ b/sources/shiboken6/generator/shibokenconfig.h.in
@@ -1,6 +1,6 @@
 #ifndef SHIBOKENCONFIG_H
 #define SHIBOKENCONFIG_H
 
-#define SHIBOKEN_VERSION    "@shiboken2_VERSION@"
+#define SHIBOKEN_VERSION    "@shiboken6_VERSION@"
 
 #endif
diff --git a/sources/shiboken2/generatorrunnerconfig.h.in b/sources/shiboken6/generatorrunnerconfig.h.in
index d291fcc53..d291fcc53 100644
--- a/sources/shiboken2/generatorrunnerconfig.h.in
+++ b/sources/shiboken6/generatorrunnerconfig.h.in
diff --git a/sources/shiboken2/generatorrunnermacros.h b/sources/shiboken6/generatorrunnermacros.h
index 1f1119dfa..1f1119dfa 100644
--- a/sources/shiboken2/generatorrunnermacros.h
+++ b/sources/shiboken6/generatorrunnermacros.h
diff --git a/sources/shiboken2/generators/shiboken/shiboken.cpp b/sources/shiboken6/generators/shiboken/shiboken.cpp
index a047c15f1..a047c15f1 100644
--- a/sources/shiboken2/generators/shiboken/shiboken.cpp
+++ b/sources/shiboken6/generators/shiboken/shiboken.cpp
diff --git a/sources/shiboken2/icecc.cmake b/sources/shiboken6/icecc.cmake
index b2bf071aa..b2bf071aa 100644
--- a/sources/shiboken2/icecc.cmake
+++ b/sources/shiboken6/icecc.cmake
diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
index f0df2bd8c..4504e7844 100644
--- a/sources/shiboken2/libshiboken/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
@@ -19,9 +19,9 @@ endmacro()
 
 option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
 if(ENABLE_VERSION_SUFFIX)
-    set(shiboken2_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
+    set(shiboken6_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
 else()
-    set(shiboken2_SUFFIX "")
+    set(shiboken6_SUFFIX "")
 endif()
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in"
@@ -41,7 +41,7 @@ set(libshiboken_MAJOR_VERSION ${shiboken_MAJOR_VERSION})
 set(libshiboken_MINOR_VERSION ${shiboken_MINOR_VERSION})
 set(libshiboken_MICRO_VERSION ${shiboken_MICRO_VERSION})
 set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}.${libshiboken_MICRO_VERSION}")
-set(libshiboken_SOVERSION "${shiboken2_library_so_version}")
+set(libshiboken_SOVERSION "${shiboken6_library_so_version}")
 
 set(libshiboken_SRC
 basewrapper.cpp
@@ -80,12 +80,12 @@ endif()
 set(APIEXTRACTOR_EXTRA_INCLUDES ${APIEXTRACTOR_EXTRA_INCLUDES} ${LIBXSLT_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
 
 add_library(libshiboken SHARED ${libshiboken_SRC})
-add_library(Shiboken2::libshiboken ALIAS libshiboken)
+add_library(Shiboken6::libshiboken ALIAS libshiboken)
 
 target_include_directories(libshiboken PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-  $<INSTALL_INTERFACE:include/shiboken2>
+  $<INSTALL_INTERFACE:include/shiboken6>
 )
 
 if (NOT "${PYTHON_NUMPY_LOCATION}" STREQUAL "")
@@ -116,7 +116,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
     target_compile_definitions(libshiboken PUBLIC "-DNDEBUG")
 endif()
 
-set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken2${shiboken2_SUFFIX}${PYTHON_SHARED_LIBRARY_SUFFIX}"
+set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken6${shiboken6_SUFFIX}${PYTHON_SHARED_LIBRARY_SUFFIX}"
                                              VERSION ${libshiboken_VERSION}
                                              SOVERSION ${libshiboken_SOVERSION}
                                              DEFINE_SYMBOL BUILD_LIBSHIBOKEN)
@@ -148,10 +148,10 @@ install(FILES
         signature.h
         signature/signature_p.h
 
-        DESTINATION include/shiboken2${shiboken2_SUFFIX})
-install(TARGETS libshiboken EXPORT Shiboken2Targets
+        DESTINATION include/shiboken6${shiboken6_SUFFIX})
+install(TARGETS libshiboken EXPORT Shiboken6Targets
                             LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
                             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
                             RUNTIME DESTINATION bin)
-install(EXPORT Shiboken2Targets NAMESPACE Shiboken2::
-        DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION})
+install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION})
diff --git a/sources/shiboken2/libshiboken/autodecref.h b/sources/shiboken6/libshiboken/autodecref.h
index 498b1aec4..498b1aec4 100644
--- a/sources/shiboken2/libshiboken/autodecref.h
+++ b/sources/shiboken6/libshiboken/autodecref.h
diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp
index 2f19e5bd2..2f19e5bd2 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken6/libshiboken/basewrapper.cpp
diff --git a/sources/shiboken2/libshiboken/basewrapper.h b/sources/shiboken6/libshiboken/basewrapper.h
index 31083522b..31083522b 100644
--- a/sources/shiboken2/libshiboken/basewrapper.h
+++ b/sources/shiboken6/libshiboken/basewrapper.h
diff --git a/sources/shiboken2/libshiboken/basewrapper_p.h b/sources/shiboken6/libshiboken/basewrapper_p.h
index 64f7941b7..64f7941b7 100644
--- a/sources/shiboken2/libshiboken/basewrapper_p.h
+++ b/sources/shiboken6/libshiboken/basewrapper_p.h
diff --git a/sources/shiboken2/libshiboken/bindingmanager.cpp b/sources/shiboken6/libshiboken/bindingmanager.cpp
index 78c03556c..78c03556c 100644
--- a/sources/shiboken2/libshiboken/bindingmanager.cpp
+++ b/sources/shiboken6/libshiboken/bindingmanager.cpp
diff --git a/sources/shiboken2/libshiboken/bindingmanager.h b/sources/shiboken6/libshiboken/bindingmanager.h
index 5b2246685..5b2246685 100644
--- a/sources/shiboken2/libshiboken/bindingmanager.h
+++ b/sources/shiboken6/libshiboken/bindingmanager.h
diff --git a/sources/shiboken2/libshiboken/bufferprocs_py37.cpp b/sources/shiboken6/libshiboken/bufferprocs_py37.cpp
index da6bb00a3..da6bb00a3 100644
--- a/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
+++ b/sources/shiboken6/libshiboken/bufferprocs_py37.cpp
diff --git a/sources/shiboken2/libshiboken/bufferprocs_py37.h b/sources/shiboken6/libshiboken/bufferprocs_py37.h
index 6fc7a3ece..6fc7a3ece 100644
--- a/sources/shiboken2/libshiboken/bufferprocs_py37.h
+++ b/sources/shiboken6/libshiboken/bufferprocs_py37.h
diff --git a/sources/shiboken2/libshiboken/debugfreehook.cpp b/sources/shiboken6/libshiboken/debugfreehook.cpp
index 3d52d88dc..3d52d88dc 100644
--- a/sources/shiboken2/libshiboken/debugfreehook.cpp
+++ b/sources/shiboken6/libshiboken/debugfreehook.cpp
diff --git a/sources/shiboken2/libshiboken/debugfreehook.h b/sources/shiboken6/libshiboken/debugfreehook.h
index fdf98d5d3..fdf98d5d3 100644
--- a/sources/shiboken2/libshiboken/debugfreehook.h
+++ b/sources/shiboken6/libshiboken/debugfreehook.h
diff --git a/sources/shiboken2/libshiboken/embed/embedding_generator.py b/sources/shiboken6/libshiboken/embed/embedding_generator.py
index 8fb498008..e7e66d646 100644
--- a/sources/shiboken2/libshiboken/embed/embedding_generator.py
+++ b/sources/shiboken6/libshiboken/embed/embedding_generator.py
@@ -106,7 +106,7 @@ def create_zipfile(limited_api):
     # We copy every Python file into this dir, but only for the right version.
     # For testing in the source dir, we need to filter.
     ignore = []
-    utils.copydir(os.path.join(source_dir, "shiboken2", "shibokenmodule", "files.dir", "shibokensupport"),
+    utils.copydir(os.path.join(source_dir, "shiboken6", "shibokenmodule", "files.dir", "shibokensupport"),
                   os.path.join(work_dir, "shibokensupport"),
                   ignore=ignore, file_filter_function=lambda name, n2: name.endswith(".py"))
     if embed_dir != work_dir:
@@ -147,7 +147,7 @@ def _embed_file(fin, fout):
     print(textwrap.dedent("""
         /*
          * This is a ZIP archive of all Python files in the directory
-         *         "shiboken2/shibokenmodule/files.dir/shibokensupport/signature"
+         *         "shiboken6/shibokenmodule/files.dir/shibokensupport/signature"
          * There is also a toplevel file "signature_bootstrap.py[c]" that will be
          * directly executed from C++ as a bootstrap loader.
          */
diff --git a/sources/shiboken2/libshiboken/embed/module_collector.py b/sources/shiboken6/libshiboken/embed/module_collector.py
index 3eaa0be5d..3eaa0be5d 100644
--- a/sources/shiboken2/libshiboken/embed/module_collector.py
+++ b/sources/shiboken6/libshiboken/embed/module_collector.py
diff --git a/sources/shiboken2/libshiboken/embed/qt_python_license.txt b/sources/shiboken6/libshiboken/embed/qt_python_license.txt
index b5f8c581a..b5f8c581a 100644
--- a/sources/shiboken2/libshiboken/embed/qt_python_license.txt
+++ b/sources/shiboken6/libshiboken/embed/qt_python_license.txt
diff --git a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py b/sources/shiboken6/libshiboken/embed/signature_bootstrap.py
index b7d9d2793..c659cc8d8 100644
--- a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
+++ b/sources/shiboken6/libshiboken/embed/signature_bootstrap.py
@@ -103,12 +103,12 @@ def bootstrap():
         sys.path.remove(support_path)
 
     try:
-        import shiboken2 as root
+        import shiboken6 as root
     except ImportError:
         # uninstalled case without ctest, try only this one which has __init__:
         import shibokenmodule as root
     rp = os.path.realpath(os.path.dirname(root.__file__))
-    # This can be the shiboken2 directory or the binary module, so search.
+    # This can be the shiboken6 directory or the binary module, so search.
     look_for = os.path.join("files.dir", "shibokensupport", "signature", "loader.py")
     while len(rp) > 3 and not os.path.exists(os.path.join(rp, look_for)):
         rp = os.path.abspath(os.path.join(rp, ".."))
diff --git a/sources/shiboken2/libshiboken/gilstate.cpp b/sources/shiboken6/libshiboken/gilstate.cpp
index 76a4d0e61..76a4d0e61 100644
--- a/sources/shiboken2/libshiboken/gilstate.cpp
+++ b/sources/shiboken6/libshiboken/gilstate.cpp
diff --git a/sources/shiboken2/libshiboken/gilstate.h b/sources/shiboken6/libshiboken/gilstate.h
index fbf39ead0..fbf39ead0 100644
--- a/sources/shiboken2/libshiboken/gilstate.h
+++ b/sources/shiboken6/libshiboken/gilstate.h
diff --git a/sources/shiboken2/libshiboken/helper.cpp b/sources/shiboken6/libshiboken/helper.cpp
index cad48951e..cad48951e 100644
--- a/sources/shiboken2/libshiboken/helper.cpp
+++ b/sources/shiboken6/libshiboken/helper.cpp
diff --git a/sources/shiboken2/libshiboken/helper.h b/sources/shiboken6/libshiboken/helper.h
index 7e46f3d93..7e46f3d93 100644
--- a/sources/shiboken2/libshiboken/helper.h
+++ b/sources/shiboken6/libshiboken/helper.h
diff --git a/sources/shiboken2/libshiboken/pep384_issue33738.cpp b/sources/shiboken6/libshiboken/pep384_issue33738.cpp
index c20edeefa..c20edeefa 100644
--- a/sources/shiboken2/libshiboken/pep384_issue33738.cpp
+++ b/sources/shiboken6/libshiboken/pep384_issue33738.cpp
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken6/libshiboken/pep384impl.cpp
index a4a272c2e..a4a272c2e 100644
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
+++ b/sources/shiboken6/libshiboken/pep384impl.cpp
diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken6/libshiboken/pep384impl.h
index d314dc6c8..d314dc6c8 100644
--- a/sources/shiboken2/libshiboken/pep384impl.h
+++ b/sources/shiboken6/libshiboken/pep384impl.h
diff --git a/sources/shiboken2/libshiboken/pep384impl_doc.rst b/sources/shiboken6/libshiboken/pep384impl_doc.rst
index d8ebdbe70..d8ebdbe70 100644
--- a/sources/shiboken2/libshiboken/pep384impl_doc.rst
+++ b/sources/shiboken6/libshiboken/pep384impl_doc.rst
diff --git a/sources/shiboken2/libshiboken/qapp_macro.cpp b/sources/shiboken6/libshiboken/qapp_macro.cpp
index 3ef3a51c6..3ef3a51c6 100644
--- a/sources/shiboken2/libshiboken/qapp_macro.cpp
+++ b/sources/shiboken6/libshiboken/qapp_macro.cpp
diff --git a/sources/shiboken2/libshiboken/qapp_macro.h b/sources/shiboken6/libshiboken/qapp_macro.h
index 9abd17c17..9abd17c17 100644
--- a/sources/shiboken2/libshiboken/qapp_macro.h
+++ b/sources/shiboken6/libshiboken/qapp_macro.h
diff --git a/sources/shiboken2/libshiboken/qt_attribution.json b/sources/shiboken6/libshiboken/qt_attribution.json
index 1efc24a97..36e7f6868 100644
--- a/sources/shiboken2/libshiboken/qt_attribution.json
+++ b/sources/shiboken6/libshiboken/qt_attribution.json
@@ -3,7 +3,7 @@
     "Name": "Python",
     "QDocModule": "QtForPython",
     "QtUsage": "Used for Qt for Python in the signature extension.",
-    "Description": "Qt for Python is an add-on for Python. The libshiboken packages of PySide uses certain parts of the source files (bufferprocs_py37.cpp, bufferprocs_py37.h). See the folder sources/shiboken2/libshiboken .",
+    "Description": "Qt for Python is an add-on for Python. The libshiboken packages of PySide uses certain parts of the source files (bufferprocs_py37.cpp, bufferprocs_py37.h). See the folder sources/shiboken6/libshiboken .",
     "Homepage": "http://www.python.org/",
     "Version": "3.7.0",
     "License": "PSF LICENSE AGREEMENT FOR PYTHON 3.7.0",
diff --git a/sources/shiboken2/libshiboken/sbkarrayconverter.cpp b/sources/shiboken6/libshiboken/sbkarrayconverter.cpp
index d94d03b34..d94d03b34 100644
--- a/sources/shiboken2/libshiboken/sbkarrayconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbkarrayconverter.cpp
diff --git a/sources/shiboken2/libshiboken/sbkarrayconverter.h b/sources/shiboken6/libshiboken/sbkarrayconverter.h
index 84cb2f57f..32bbd8284 100644
--- a/sources/shiboken2/libshiboken/sbkarrayconverter.h
+++ b/sources/shiboken6/libshiboken/sbkarrayconverter.h
@@ -64,7 +64,7 @@ enum : int {
 };
 
 /**
- * ArrayHandle is the type expected by shiboken2's array converter
+ * ArrayHandle is the type expected by shiboken6's array converter
  * functions. It provides access to array data which it may own
  * (in the case of conversions from PySequence) or a flat pointer
  * to internal data (in the case of array modules like numpy).
diff --git a/sources/shiboken2/libshiboken/sbkarrayconverter_p.h b/sources/shiboken6/libshiboken/sbkarrayconverter_p.h
index a7b46702b..a7b46702b 100644
--- a/sources/shiboken2/libshiboken/sbkarrayconverter_p.h
+++ b/sources/shiboken6/libshiboken/sbkarrayconverter_p.h
diff --git a/sources/shiboken2/libshiboken/sbkconverter.cpp b/sources/shiboken6/libshiboken/sbkconverter.cpp
index 29eb19715..29eb19715 100644
--- a/sources/shiboken2/libshiboken/sbkconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbkconverter.cpp
diff --git a/sources/shiboken2/libshiboken/sbkconverter.h b/sources/shiboken6/libshiboken/sbkconverter.h
index 6c7a29300..6c7a29300 100644
--- a/sources/shiboken2/libshiboken/sbkconverter.h
+++ b/sources/shiboken6/libshiboken/sbkconverter.h
diff --git a/sources/shiboken2/libshiboken/sbkconverter_p.h b/sources/shiboken6/libshiboken/sbkconverter_p.h
index 7508d98a4..7508d98a4 100644
--- a/sources/shiboken2/libshiboken/sbkconverter_p.h
+++ b/sources/shiboken6/libshiboken/sbkconverter_p.h
diff --git a/sources/shiboken2/libshiboken/sbkdbg.h b/sources/shiboken6/libshiboken/sbkdbg.h
index 2a3211489..2a3211489 100644
--- a/sources/shiboken2/libshiboken/sbkdbg.h
+++ b/sources/shiboken6/libshiboken/sbkdbg.h
diff --git a/sources/shiboken2/libshiboken/sbkenum.cpp b/sources/shiboken6/libshiboken/sbkenum.cpp
index 948f57f23..eeb076363 100644
--- a/sources/shiboken2/libshiboken/sbkenum.cpp
+++ b/sources/shiboken6/libshiboken/sbkenum.cpp
@@ -393,7 +393,7 @@ extern "C" {
 // Initialization
 static bool _init_enum()
 {
-    static PyObject *shiboken_name = Py_BuildValue("s", "shiboken2");
+    static PyObject *shiboken_name = Py_BuildValue("s", "shiboken6");
     if (shiboken_name == nullptr)
         return false;
     Shiboken::AutoDecRef shibo(PyImport_GetModule(shiboken_name));
diff --git a/sources/shiboken2/libshiboken/sbkenum.h b/sources/shiboken6/libshiboken/sbkenum.h
index c294c17d9..c294c17d9 100644
--- a/sources/shiboken2/libshiboken/sbkenum.h
+++ b/sources/shiboken6/libshiboken/sbkenum.h
diff --git a/sources/shiboken2/libshiboken/sbkmodule.cpp b/sources/shiboken6/libshiboken/sbkmodule.cpp
index e5f4e2f88..e5f4e2f88 100644
--- a/sources/shiboken2/libshiboken/sbkmodule.cpp
+++ b/sources/shiboken6/libshiboken/sbkmodule.cpp
diff --git a/sources/shiboken2/libshiboken/sbkmodule.h b/sources/shiboken6/libshiboken/sbkmodule.h
index 02e4a2706..02e4a2706 100644
--- a/sources/shiboken2/libshiboken/sbkmodule.h
+++ b/sources/shiboken6/libshiboken/sbkmodule.h
diff --git a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp b/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp
index 996968fa1..996968fa1 100644
--- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbknumpyarrayconverter.cpp
diff --git a/sources/shiboken2/libshiboken/sbkpython.h b/sources/shiboken6/libshiboken/sbkpython.h
index 772fe76ac..772fe76ac 100644
--- a/sources/shiboken2/libshiboken/sbkpython.h
+++ b/sources/shiboken6/libshiboken/sbkpython.h
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp b/sources/shiboken6/libshiboken/sbkstaticstrings.cpp
index 5559d58d6..5559d58d6 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
+++ b/sources/shiboken6/libshiboken/sbkstaticstrings.cpp
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.h b/sources/shiboken6/libshiboken/sbkstaticstrings.h
index 16d36041e..16d36041e 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.h
+++ b/sources/shiboken6/libshiboken/sbkstaticstrings.h
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings_p.h b/sources/shiboken6/libshiboken/sbkstaticstrings_p.h
index acfc71409..acfc71409 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings_p.h
+++ b/sources/shiboken6/libshiboken/sbkstaticstrings_p.h
diff --git a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken6/libshiboken/sbkstring.cpp
index 93a630ac8..93a630ac8 100644
--- a/sources/shiboken2/libshiboken/sbkstring.cpp
+++ b/sources/shiboken6/libshiboken/sbkstring.cpp
diff --git a/sources/shiboken2/libshiboken/sbkstring.h b/sources/shiboken6/libshiboken/sbkstring.h
index 817b8acc2..817b8acc2 100644
--- a/sources/shiboken2/libshiboken/sbkstring.h
+++ b/sources/shiboken6/libshiboken/sbkstring.h
diff --git a/sources/shiboken2/libshiboken/sbkversion.h.in b/sources/shiboken6/libshiboken/sbkversion.h.in
index 99ee7f93e..99ee7f93e 100644
--- a/sources/shiboken2/libshiboken/sbkversion.h.in
+++ b/sources/shiboken6/libshiboken/sbkversion.h.in
diff --git a/sources/shiboken2/libshiboken/shiboken.h b/sources/shiboken6/libshiboken/shiboken.h
index 3e1df5235..3e1df5235 100644
--- a/sources/shiboken2/libshiboken/shiboken.h
+++ b/sources/shiboken6/libshiboken/shiboken.h
diff --git a/sources/shiboken2/libshiboken/shibokenbuffer.cpp b/sources/shiboken6/libshiboken/shibokenbuffer.cpp
index 5bae38aa5..5bae38aa5 100644
--- a/sources/shiboken2/libshiboken/shibokenbuffer.cpp
+++ b/sources/shiboken6/libshiboken/shibokenbuffer.cpp
diff --git a/sources/shiboken2/libshiboken/shibokenbuffer.h b/sources/shiboken6/libshiboken/shibokenbuffer.h
index dc9f8d89f..dc9f8d89f 100644
--- a/sources/shiboken2/libshiboken/shibokenbuffer.h
+++ b/sources/shiboken6/libshiboken/shibokenbuffer.h
diff --git a/sources/shiboken2/libshiboken/shibokenmacros.h b/sources/shiboken6/libshiboken/shibokenmacros.h
index d8f45868a..d8f45868a 100644
--- a/sources/shiboken2/libshiboken/shibokenmacros.h
+++ b/sources/shiboken6/libshiboken/shibokenmacros.h
diff --git a/sources/shiboken2/libshiboken/signature.h b/sources/shiboken6/libshiboken/signature.h
index b77cc0f4c..b77cc0f4c 100644
--- a/sources/shiboken2/libshiboken/signature.h
+++ b/sources/shiboken6/libshiboken/signature.h
diff --git a/sources/shiboken2/libshiboken/signature/signature.cpp b/sources/shiboken6/libshiboken/signature/signature.cpp
index 05d3cad2d..05d3cad2d 100644
--- a/sources/shiboken2/libshiboken/signature/signature.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature.cpp
diff --git a/sources/shiboken2/libshiboken/signature/signature_doc.rst b/sources/shiboken6/libshiboken/signature/signature_doc.rst
index f3dc652b6..95f0b8b08 100644
--- a/sources/shiboken2/libshiboken/signature/signature_doc.rst
+++ b/sources/shiboken6/libshiboken/signature/signature_doc.rst
@@ -106,10 +106,10 @@ The Signature Package Structure
 -------------------------------
 
 The C++ code involved with the signature module is completely in the file
-shiboken2/libshiboken/signature.cpp . All other functionality is implemented in
+shiboken6/libshiboken/signature.cpp . All other functionality is implemented in
 the ``signature`` Python package. It has the following structure::
 
-    shiboken2/files.dir/shibokensupport/
+    shiboken6/files.dir/shibokensupport/
                                         backport_inspect.py
 
                                         signature/
diff --git a/sources/shiboken2/libshiboken/signature/signature_extend.cpp b/sources/shiboken6/libshiboken/signature/signature_extend.cpp
index 1490a6003..1490a6003 100644
--- a/sources/shiboken2/libshiboken/signature/signature_extend.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature_extend.cpp
diff --git a/sources/shiboken2/libshiboken/signature/signature_globals.cpp b/sources/shiboken6/libshiboken/signature/signature_globals.cpp
index 6af64682e..6af64682e 100644
--- a/sources/shiboken2/libshiboken/signature/signature_globals.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature_globals.cpp
diff --git a/sources/shiboken2/libshiboken/signature/signature_helper.cpp b/sources/shiboken6/libshiboken/signature/signature_helper.cpp
index 2b360c786..2b360c786 100644
--- a/sources/shiboken2/libshiboken/signature/signature_helper.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature_helper.cpp
diff --git a/sources/shiboken2/libshiboken/signature/signature_p.h b/sources/shiboken6/libshiboken/signature/signature_p.h
index ef7846472..ef7846472 100644
--- a/sources/shiboken2/libshiboken/signature/signature_p.h
+++ b/sources/shiboken6/libshiboken/signature/signature_p.h
diff --git a/sources/shiboken2/libshiboken/threadstatesaver.cpp b/sources/shiboken6/libshiboken/threadstatesaver.cpp
index 7c587b405..7c587b405 100644
--- a/sources/shiboken2/libshiboken/threadstatesaver.cpp
+++ b/sources/shiboken6/libshiboken/threadstatesaver.cpp
diff --git a/sources/shiboken2/libshiboken/threadstatesaver.h b/sources/shiboken6/libshiboken/threadstatesaver.h
index ddfbcb93b..ddfbcb93b 100644
--- a/sources/shiboken2/libshiboken/threadstatesaver.h
+++ b/sources/shiboken6/libshiboken/threadstatesaver.h
diff --git a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp b/sources/shiboken6/libshiboken/tmp-referencetopython/sbkconverter.cpp
index ab205e215..ab205e215 100644
--- a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp
+++ b/sources/shiboken6/libshiboken/tmp-referencetopython/sbkconverter.cpp
diff --git a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.h b/sources/shiboken6/libshiboken/tmp-referencetopython/sbkconverter.h
index 3578e4039..3578e4039 100644
--- a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.h
+++ b/sources/shiboken6/libshiboken/tmp-referencetopython/sbkconverter.h
diff --git a/sources/shiboken2/libshiboken/voidptr.cpp b/sources/shiboken6/libshiboken/voidptr.cpp
index 1ef1aea09..9eb0c01eb 100644
--- a/sources/shiboken2/libshiboken/voidptr.cpp
+++ b/sources/shiboken6/libshiboken/voidptr.cpp
@@ -299,7 +299,7 @@ static PyType_Slot SbkVoidPtrType_slots[] = {
     {0, nullptr}
 };
 static PyType_Spec SbkVoidPtrType_spec = {
-    "2:shiboken2.shiboken2.VoidPtr",
+    "2:shiboken6.shiboken6.VoidPtr",
     sizeof(SbkVoidPtrObject),
     0,
     Py_TPFLAGS_DEFAULT,
diff --git a/sources/shiboken2/libshiboken/voidptr.h b/sources/shiboken6/libshiboken/voidptr.h
index e74c1045e..e74c1045e 100644
--- a/sources/shiboken2/libshiboken/voidptr.h
+++ b/sources/shiboken6/libshiboken/voidptr.h
diff --git a/sources/shiboken2/shiboken_tool.py b/sources/shiboken6/shiboken_tool.py
index 8494c5d57..8494c5d57 100755
--- a/sources/shiboken2/shiboken_tool.py
+++ b/sources/shiboken6/shiboken_tool.py
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken6/shiboken_version.py
index 88b65353f..88b65353f 100644
--- a/sources/shiboken2/shiboken_version.py
+++ b/sources/shiboken6/shiboken_version.py
diff --git a/sources/shiboken2/shibokenmodule/CMakeLists.txt b/sources/shiboken6/shibokenmodule/CMakeLists.txt
index c182cf632..eb8412462 100644
--- a/sources/shiboken2/shibokenmodule/CMakeLists.txt
+++ b/sources/shiboken6/shibokenmodule/CMakeLists.txt
@@ -3,27 +3,27 @@ project(shibokenmodule)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shibokenmodule.txt.in"
                "${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt" @ONLY)
 
-set(sample_SRC ${CMAKE_CURRENT_BINARY_DIR}/shiboken2/shiboken2_module_wrapper.cpp)
+set(sample_SRC ${CMAKE_CURRENT_BINARY_DIR}/shiboken6/shiboken6_module_wrapper.cpp)
 
 set(shibokenmodule_TYPESYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_shiboken.xml)
 
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
 BYPRODUCTS ${sample_SRC}
-# Note: shiboken2 is an executable target. By not specifying its explicit
+# Note: shiboken6 is an executable target. By not specifying its explicit
 # path, CMAKE figures it out, itself!
-# This fixes an issue with Visual Studio, see https://github.com/PySide/shiboken2/pull/11
-COMMAND shiboken2 --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+# This fixes an issue with Visual Studio, see https://github.com/PySide/shiboken6/pull/11
+COMMAND shiboken6 --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
 DEPENDS ${shibokenmodule_TYPESYSTEM}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-COMMENT "Running generator for 'shiboken2'..."
+COMMENT "Running generator for 'shiboken6'..."
 )
 
 add_library(shibokenmodule MODULE ${sample_SRC})
 target_include_directories(shibokenmodule PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
                                                   ${CMAKE_SOURCE_DIR})
 set_property(TARGET shibokenmodule PROPERTY PREFIX "")
-set_property(TARGET shibokenmodule PROPERTY OUTPUT_NAME "shiboken2${PYTHON_EXTENSION_SUFFIX}")
+set_property(TARGET shibokenmodule PROPERTY OUTPUT_NAME "shiboken6${PYTHON_EXTENSION_SUFFIX}")
 
 if(WIN32)
     set_property(TARGET shibokenmodule PROPERTY SUFFIX ".pyd")
@@ -32,12 +32,12 @@ target_link_libraries(shibokenmodule PUBLIC libshiboken)
 
 create_generator_target(shibokenmodule)
 
-install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES}/shiboken2)
+install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES}/shiboken6)
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in"
                "${CMAKE_CURRENT_BINARY_DIR}/_config.py" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/_config.py"
-        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken2")
+        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken6")
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in"
                "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY)
@@ -68,10 +68,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/files.dir/shibokensupport/signature/
                "${CMAKE_CURRENT_BINARY_DIR}/files.dir/shibokensupport/signature/lib/tool.py" COPYONLY)
 
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/files.dir"
-        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken2")
+        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken6")
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
-       DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken2")
+       DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken6")
 
 # Use absolute path instead of relative path, to avoid ninja build errors due to
 # duplicate file dependency inconsistency.
@@ -81,4 +81,4 @@ configure_file("${shiboken_version_path}"
                "${CMAKE_CURRENT_BINARY_DIR}/_git_shiboken_module_version.py" @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/_git_shiboken_module_version.py"
-        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken2")
+        DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken6")
diff --git a/sources/shiboken2/shibokenmodule/__init__.py.in b/sources/shiboken6/shibokenmodule/__init__.py.in
index f99011c7f..e4e978299 100644
--- a/sources/shiboken2/shibokenmodule/__init__.py.in
+++ b/sources/shiboken6/shibokenmodule/__init__.py.in
@@ -22,7 +22,7 @@ import keyword
 import functools
 import typing
 
-from .shiboken2 import *
+from .shiboken6 import *
 
 # Trigger signature initialization via __builtins__.
 _init_pyside_extension()
diff --git a/sources/shiboken2/shibokenmodule/_config.py.in b/sources/shiboken6/shibokenmodule/_config.py.in
index 9607e5ca7..92b3cd23c 100644
--- a/sources/shiboken2/shibokenmodule/_config.py.in
+++ b/sources/shiboken6/shibokenmodule/_config.py.in
@@ -1,4 +1,4 @@
-shiboken_library_soversion = str(@shiboken2_library_so_version@)
+shiboken_library_soversion = str(@shiboken6_library_so_version@)
 
 version = "@FINAL_PACKAGE_VERSION@"
 version_info = (@shiboken_MAJOR_VERSION@, @shiboken_MINOR_VERSION@, @shiboken_MICRO_VERSION@, "@shiboken_PRE_RELEASE_VERSION_TYPE@", "@shiboken_PRE_RELEASE_VERSION@")
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/__feature__.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py
index ece3d2edb..ece3d2edb 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/__feature__.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/__init__.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__init__.py
index 2d640cb89..2d640cb89 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/__init__.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__init__.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/fix-complaints.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/fix-complaints.py
index 3818ad602..3818ad602 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/fix-complaints.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/fix-complaints.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/PSF-3.7.0.txt b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/PSF-3.7.0.txt
index be42010dd..be42010dd 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/PSF-3.7.0.txt
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/PSF-3.7.0.txt
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/__init__.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/__init__.py
index ee541d0ea..ee541d0ea 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/__init__.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/__init__.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py
index 8ddb75c19..8ddb75c19 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
index 7af43bea0..7af43bea0 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/layout.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/layout.py
index 51ce60bfa..51ce60bfa 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/layout.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/layout.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/__init__.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/__init__.py
index 2d640cb89..2d640cb89 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/__init__.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/__init__.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
index 371b3ca4a..371b3ca4a 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
index 24e75e42c..24e75e42c 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
index 49c6439b7..49c6439b7 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index bb8ce48bf..c043b8435 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -361,7 +361,7 @@ type_map.update({
 def init_Shiboken():
     type_map.update({
         "PyType": type,
-        "shiboken2.bool": bool,
+        "shiboken6.bool": bool,
         "size_t": int,
     })
     return locals()
@@ -580,7 +580,7 @@ def init_PySide2_QtXmlPatterns():
 
 def init_PySide2_QtMultimedia():
     import PySide2.QtMultimediaWidgets
-    # Check if foreign import is valid. See mapping.py in shiboken2.
+    # Check if foreign import is valid. See mapping.py in shiboken6.
     check_module(PySide2.QtMultimediaWidgets)
     type_map.update({
         "QGraphicsVideoItem": PySide2.QtMultimediaWidgets.QGraphicsVideoItem,
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
index 20c791cc1..20c791cc1 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/qt_attribution.json b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/qt_attribution.json
index fbe4c51ab..4cbec4824 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/qt_attribution.json
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/qt_attribution.json
@@ -3,7 +3,7 @@
     "Name": "Python",
     "QDocModule": "QtForPython",
     "QtUsage": "Used for Qt for Python in the signature extension.",
-    "Description": "Qt for Python is an add-on for Python. The signature packages of PySide uses certain copied and adapted source files (backport_inspect.py, typing27.py). See the folder sources/shiboken2/files.dir/shibokensupport/signature .",
+    "Description": "Qt for Python is an add-on for Python. The signature packages of PySide uses certain copied and adapted source files (backport_inspect.py, typing27.py). See the folder sources/shiboken6/files.dir/shibokensupport/signature .",
     "Homepage": "http://www.python.org/",
     "Version": "3.7.0",
     "LicenseId": "Python-2.0",
diff --git a/sources/shiboken2/shibokenmodule/nothing.h b/sources/shiboken6/shibokenmodule/nothing.h
index e69de29bb..e69de29bb 100644
--- a/sources/shiboken2/shibokenmodule/nothing.h
+++ b/sources/shiboken6/shibokenmodule/nothing.h
diff --git a/sources/shiboken2/shibokenmodule/shibokenmodule.txt.in b/sources/shiboken6/shibokenmodule/shibokenmodule.txt.in
index c5adc6091..c5adc6091 100644
--- a/sources/shiboken2/shibokenmodule/shibokenmodule.txt.in
+++ b/sources/shiboken6/shibokenmodule/shibokenmodule.txt.in
diff --git a/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml b/sources/shiboken6/shibokenmodule/typesystem_shiboken.xml
index 3eba557fb..361db53cf 100644
--- a/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml
+++ b/sources/shiboken6/shibokenmodule/typesystem_shiboken.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<typesystem package="shiboken2">
+<typesystem package="shiboken6">
     <custom-type name="PyObject" />
     <custom-type name="PyType" />
     <primitive-type name="bool" />
diff --git a/sources/shiboken2/tests/CMakeLists.txt b/sources/shiboken6/tests/CMakeLists.txt
index fcd3f43bd..fcd3f43bd 100644
--- a/sources/shiboken2/tests/CMakeLists.txt
+++ b/sources/shiboken6/tests/CMakeLists.txt
diff --git a/sources/shiboken2/tests/dumpcodemodel/CMakeLists.txt b/sources/shiboken6/tests/dumpcodemodel/CMakeLists.txt
index 5c5e2c7b0..5c5e2c7b0 100644
--- a/sources/shiboken2/tests/dumpcodemodel/CMakeLists.txt
+++ b/sources/shiboken6/tests/dumpcodemodel/CMakeLists.txt
diff --git a/sources/shiboken2/tests/dumpcodemodel/main.cpp b/sources/shiboken6/tests/dumpcodemodel/main.cpp
index 37c964fc0..37c964fc0 100644
--- a/sources/shiboken2/tests/dumpcodemodel/main.cpp
+++ b/sources/shiboken6/tests/dumpcodemodel/main.cpp
diff --git a/sources/shiboken2/tests/libminimal/CMakeLists.txt b/sources/shiboken6/tests/libminimal/CMakeLists.txt
index f906bdb84..f906bdb84 100644
--- a/sources/shiboken2/tests/libminimal/CMakeLists.txt
+++ b/sources/shiboken6/tests/libminimal/CMakeLists.txt
diff --git a/sources/shiboken2/tests/libminimal/libminimalmacros.h b/sources/shiboken6/tests/libminimal/libminimalmacros.h
index a9c417624..a9c417624 100644
--- a/sources/shiboken2/tests/libminimal/libminimalmacros.h
+++ b/sources/shiboken6/tests/libminimal/libminimalmacros.h
diff --git a/sources/shiboken2/tests/libminimal/listuser.cpp b/sources/shiboken6/tests/libminimal/listuser.cpp
index 4ce00f39c..4ce00f39c 100644
--- a/sources/shiboken2/tests/libminimal/listuser.cpp
+++ b/sources/shiboken6/tests/libminimal/listuser.cpp
diff --git a/sources/shiboken2/tests/libminimal/listuser.h b/sources/shiboken6/tests/libminimal/listuser.h
index 6c7e6aedd..6c7e6aedd 100644
--- a/sources/shiboken2/tests/libminimal/listuser.h
+++ b/sources/shiboken6/tests/libminimal/listuser.h
diff --git a/sources/shiboken2/tests/libminimal/minbool.h b/sources/shiboken6/tests/libminimal/minbool.h
index 72a2cbabe..72a2cbabe 100644
--- a/sources/shiboken2/tests/libminimal/minbool.h
+++ b/sources/shiboken6/tests/libminimal/minbool.h
diff --git a/sources/shiboken2/tests/libminimal/obj.cpp b/sources/shiboken6/tests/libminimal/obj.cpp
index fd6e9f7d9..fd6e9f7d9 100644
--- a/sources/shiboken2/tests/libminimal/obj.cpp
+++ b/sources/shiboken6/tests/libminimal/obj.cpp
diff --git a/sources/shiboken2/tests/libminimal/obj.h b/sources/shiboken6/tests/libminimal/obj.h
index a5e20d496..a5e20d496 100644
--- a/sources/shiboken2/tests/libminimal/obj.h
+++ b/sources/shiboken6/tests/libminimal/obj.h
diff --git a/sources/shiboken2/tests/libminimal/typedef.cpp b/sources/shiboken6/tests/libminimal/typedef.cpp
index e0886d982..e0886d982 100644
--- a/sources/shiboken2/tests/libminimal/typedef.cpp
+++ b/sources/shiboken6/tests/libminimal/typedef.cpp
diff --git a/sources/shiboken2/tests/libminimal/typedef.h b/sources/shiboken6/tests/libminimal/typedef.h
index b8d6faacd..b8d6faacd 100644
--- a/sources/shiboken2/tests/libminimal/typedef.h
+++ b/sources/shiboken6/tests/libminimal/typedef.h
diff --git a/sources/shiboken2/tests/libminimal/val.h b/sources/shiboken6/tests/libminimal/val.h
index 9af7ab70a..9af7ab70a 100644
--- a/sources/shiboken2/tests/libminimal/val.h
+++ b/sources/shiboken6/tests/libminimal/val.h
diff --git a/sources/shiboken2/tests/libother/CMakeLists.txt b/sources/shiboken6/tests/libother/CMakeLists.txt
index c078d3546..c078d3546 100644
--- a/sources/shiboken2/tests/libother/CMakeLists.txt
+++ b/sources/shiboken6/tests/libother/CMakeLists.txt
diff --git a/sources/shiboken2/tests/libother/extendsnoimplicitconversion.h b/sources/shiboken6/tests/libother/extendsnoimplicitconversion.h
index e1bcf0961..e1bcf0961 100644
--- a/sources/shiboken2/tests/libother/extendsnoimplicitconversion.h
+++ b/sources/shiboken6/tests/libother/extendsnoimplicitconversion.h
diff --git a/sources/shiboken2/tests/libother/libothermacros.h b/sources/shiboken6/tests/libother/libothermacros.h
index 757e9a304..757e9a304 100644
--- a/sources/shiboken2/tests/libother/libothermacros.h
+++ b/sources/shiboken6/tests/libother/libothermacros.h
diff --git a/sources/shiboken2/tests/libother/number.cpp b/sources/shiboken6/tests/libother/number.cpp
index bc97de6a6..bc97de6a6 100644
--- a/sources/shiboken2/tests/libother/number.cpp
+++ b/sources/shiboken6/tests/libother/number.cpp
diff --git a/sources/shiboken2/tests/libother/number.h b/sources/shiboken6/tests/libother/number.h
index 222c6e1a6..222c6e1a6 100644
--- a/sources/shiboken2/tests/libother/number.h
+++ b/sources/shiboken6/tests/libother/number.h
diff --git a/sources/shiboken2/tests/libother/otherderived.cpp b/sources/shiboken6/tests/libother/otherderived.cpp
index d23f6ad23..d23f6ad23 100644
--- a/sources/shiboken2/tests/libother/otherderived.cpp
+++ b/sources/shiboken6/tests/libother/otherderived.cpp
diff --git a/sources/shiboken2/tests/libother/otherderived.h b/sources/shiboken6/tests/libother/otherderived.h
index 72e1e2302..72e1e2302 100644
--- a/sources/shiboken2/tests/libother/otherderived.h
+++ b/sources/shiboken6/tests/libother/otherderived.h
diff --git a/sources/shiboken2/tests/libother/othermultiplederived.cpp b/sources/shiboken6/tests/libother/othermultiplederived.cpp
index e7ee4f96d..e7ee4f96d 100644
--- a/sources/shiboken2/tests/libother/othermultiplederived.cpp
+++ b/sources/shiboken6/tests/libother/othermultiplederived.cpp
diff --git a/sources/shiboken2/tests/libother/othermultiplederived.h b/sources/shiboken6/tests/libother/othermultiplederived.h
index 84a426ac9..84a426ac9 100644
--- a/sources/shiboken2/tests/libother/othermultiplederived.h
+++ b/sources/shiboken6/tests/libother/othermultiplederived.h
diff --git a/sources/shiboken2/tests/libother/otherobjecttype.cpp b/sources/shiboken6/tests/libother/otherobjecttype.cpp
index c7778e7c9..c7778e7c9 100644
--- a/sources/shiboken2/tests/libother/otherobjecttype.cpp
+++ b/sources/shiboken6/tests/libother/otherobjecttype.cpp
diff --git a/sources/shiboken2/tests/libother/otherobjecttype.h b/sources/shiboken6/tests/libother/otherobjecttype.h
index a9362c370..a9362c370 100644
--- a/sources/shiboken2/tests/libother/otherobjecttype.h
+++ b/sources/shiboken6/tests/libother/otherobjecttype.h
diff --git a/sources/shiboken2/tests/libother/othertypesystypedef.cpp b/sources/shiboken6/tests/libother/othertypesystypedef.cpp
index 7e6e1ff64..7e6e1ff64 100644
--- a/sources/shiboken2/tests/libother/othertypesystypedef.cpp
+++ b/sources/shiboken6/tests/libother/othertypesystypedef.cpp
diff --git a/sources/shiboken2/tests/libother/othertypesystypedef.h b/sources/shiboken6/tests/libother/othertypesystypedef.h
index e3f434613..e3f434613 100644
--- a/sources/shiboken2/tests/libother/othertypesystypedef.h
+++ b/sources/shiboken6/tests/libother/othertypesystypedef.h
diff --git a/sources/shiboken2/tests/libother/smartptrtester.cpp b/sources/shiboken6/tests/libother/smartptrtester.cpp
index 9636c7521..9636c7521 100644
--- a/sources/shiboken2/tests/libother/smartptrtester.cpp
+++ b/sources/shiboken6/tests/libother/smartptrtester.cpp
diff --git a/sources/shiboken2/tests/libother/smartptrtester.h b/sources/shiboken6/tests/libother/smartptrtester.h
index a560bcf2f..a560bcf2f 100644
--- a/sources/shiboken2/tests/libother/smartptrtester.h
+++ b/sources/shiboken6/tests/libother/smartptrtester.h
diff --git a/sources/shiboken2/tests/libsample/CMakeLists.txt b/sources/shiboken6/tests/libsample/CMakeLists.txt
index 3bf119e9f..3bf119e9f 100644
--- a/sources/shiboken2/tests/libsample/CMakeLists.txt
+++ b/sources/shiboken6/tests/libsample/CMakeLists.txt
diff --git a/sources/shiboken2/tests/libsample/abstract.cpp b/sources/shiboken6/tests/libsample/abstract.cpp
index e60c792c4..e60c792c4 100644
--- a/sources/shiboken2/tests/libsample/abstract.cpp
+++ b/sources/shiboken6/tests/libsample/abstract.cpp
diff --git a/sources/shiboken2/tests/libsample/abstract.h b/sources/shiboken6/tests/libsample/abstract.h
index 09906f1ee..09906f1ee 100644
--- a/sources/shiboken2/tests/libsample/abstract.h
+++ b/sources/shiboken6/tests/libsample/abstract.h
diff --git a/sources/shiboken2/tests/libsample/blackbox.cpp b/sources/shiboken6/tests/libsample/blackbox.cpp
index 0546ba7c2..0546ba7c2 100644
--- a/sources/shiboken2/tests/libsample/blackbox.cpp
+++ b/sources/shiboken6/tests/libsample/blackbox.cpp
diff --git a/sources/shiboken2/tests/libsample/blackbox.h b/sources/shiboken6/tests/libsample/blackbox.h
index 629a217cc..629a217cc 100644
--- a/sources/shiboken2/tests/libsample/blackbox.h
+++ b/sources/shiboken6/tests/libsample/blackbox.h
diff --git a/sources/shiboken2/tests/libsample/bucket.cpp b/sources/shiboken6/tests/libsample/bucket.cpp
index 91e546d6e..91e546d6e 100644
--- a/sources/shiboken2/tests/libsample/bucket.cpp
+++ b/sources/shiboken6/tests/libsample/bucket.cpp
diff --git a/sources/shiboken2/tests/libsample/bucket.h b/sources/shiboken6/tests/libsample/bucket.h
index 09f933863..09f933863 100644
--- a/sources/shiboken2/tests/libsample/bucket.h
+++ b/sources/shiboken6/tests/libsample/bucket.h
diff --git a/sources/shiboken2/tests/libsample/bytearray.cpp b/sources/shiboken6/tests/libsample/bytearray.cpp
index 021d2a079..021d2a079 100644
--- a/sources/shiboken2/tests/libsample/bytearray.cpp
+++ b/sources/shiboken6/tests/libsample/bytearray.cpp
diff --git a/sources/shiboken2/tests/libsample/bytearray.h b/sources/shiboken6/tests/libsample/bytearray.h
index 5dfb63fd5..5dfb63fd5 100644
--- a/sources/shiboken2/tests/libsample/bytearray.h
+++ b/sources/shiboken6/tests/libsample/bytearray.h
diff --git a/sources/shiboken2/tests/libsample/collector.cpp b/sources/shiboken6/tests/libsample/collector.cpp
index 398f79918..398f79918 100644
--- a/sources/shiboken2/tests/libsample/collector.cpp
+++ b/sources/shiboken6/tests/libsample/collector.cpp
diff --git a/sources/shiboken2/tests/libsample/collector.h b/sources/shiboken6/tests/libsample/collector.h
index 6d51c624c..6d51c624c 100644
--- a/sources/shiboken2/tests/libsample/collector.h
+++ b/sources/shiboken6/tests/libsample/collector.h
diff --git a/sources/shiboken2/tests/libsample/complex.cpp b/sources/shiboken6/tests/libsample/complex.cpp
index a9b7f03c3..a9b7f03c3 100644
--- a/sources/shiboken2/tests/libsample/complex.cpp
+++ b/sources/shiboken6/tests/libsample/complex.cpp
diff --git a/sources/shiboken2/tests/libsample/complex.h b/sources/shiboken6/tests/libsample/complex.h
index d0f6c1408..d0f6c1408 100644
--- a/sources/shiboken2/tests/libsample/complex.h
+++ b/sources/shiboken6/tests/libsample/complex.h
diff --git a/sources/shiboken2/tests/libsample/ctorconvrule.h b/sources/shiboken6/tests/libsample/ctorconvrule.h
index ceab8d6dc..ceab8d6dc 100644
--- a/sources/shiboken2/tests/libsample/ctorconvrule.h
+++ b/sources/shiboken6/tests/libsample/ctorconvrule.h
diff --git a/sources/shiboken2/tests/libsample/cvlist.h b/sources/shiboken6/tests/libsample/cvlist.h
index 50ad8bfe8..50ad8bfe8 100644
--- a/sources/shiboken2/tests/libsample/cvlist.h
+++ b/sources/shiboken6/tests/libsample/cvlist.h
diff --git a/sources/shiboken2/tests/libsample/derived.cpp b/sources/shiboken6/tests/libsample/derived.cpp
index 0dc026876..0dc026876 100644
--- a/sources/shiboken2/tests/libsample/derived.cpp
+++ b/sources/shiboken6/tests/libsample/derived.cpp
diff --git a/sources/shiboken2/tests/libsample/derived.h b/sources/shiboken6/tests/libsample/derived.h
index 783a6dc50..783a6dc50 100644
--- a/sources/shiboken2/tests/libsample/derived.h
+++ b/sources/shiboken6/tests/libsample/derived.h
diff --git a/sources/shiboken2/tests/libsample/echo.cpp b/sources/shiboken6/tests/libsample/echo.cpp
index 55e2a461e..55e2a461e 100644
--- a/sources/shiboken2/tests/libsample/echo.cpp
+++ b/sources/shiboken6/tests/libsample/echo.cpp
diff --git a/sources/shiboken2/tests/libsample/echo.h b/sources/shiboken6/tests/libsample/echo.h
index 3f645694a..3f645694a 100644
--- a/sources/shiboken2/tests/libsample/echo.h
+++ b/sources/shiboken6/tests/libsample/echo.h
diff --git a/sources/shiboken2/tests/libsample/exceptiontest.cpp b/sources/shiboken6/tests/libsample/exceptiontest.cpp
index 1302a8e43..1302a8e43 100644
--- a/sources/shiboken2/tests/libsample/exceptiontest.cpp
+++ b/sources/shiboken6/tests/libsample/exceptiontest.cpp
diff --git a/sources/shiboken2/tests/libsample/exceptiontest.h b/sources/shiboken6/tests/libsample/exceptiontest.h
index 8ab3e2b67..8ab3e2b67 100644
--- a/sources/shiboken2/tests/libsample/exceptiontest.h
+++ b/sources/shiboken6/tests/libsample/exceptiontest.h
diff --git a/sources/shiboken2/tests/libsample/expression.cpp b/sources/shiboken6/tests/libsample/expression.cpp
index 0c255a659..0c255a659 100644
--- a/sources/shiboken2/tests/libsample/expression.cpp
+++ b/sources/shiboken6/tests/libsample/expression.cpp
diff --git a/sources/shiboken2/tests/libsample/expression.h b/sources/shiboken6/tests/libsample/expression.h
index 3add5572e..3add5572e 100644
--- a/sources/shiboken2/tests/libsample/expression.h
+++ b/sources/shiboken6/tests/libsample/expression.h
diff --git a/sources/shiboken2/tests/libsample/filter.cpp b/sources/shiboken6/tests/libsample/filter.cpp
index f862babd2..f862babd2 100644
--- a/sources/shiboken2/tests/libsample/filter.cpp
+++ b/sources/shiboken6/tests/libsample/filter.cpp
diff --git a/sources/shiboken2/tests/libsample/filter.h b/sources/shiboken6/tests/libsample/filter.h
index e318cba20..e318cba20 100644
--- a/sources/shiboken2/tests/libsample/filter.h
+++ b/sources/shiboken6/tests/libsample/filter.h
diff --git a/sources/shiboken2/tests/libsample/functions.cpp b/sources/shiboken6/tests/libsample/functions.cpp
index 288fa96ee..288fa96ee 100644
--- a/sources/shiboken2/tests/libsample/functions.cpp
+++ b/sources/shiboken6/tests/libsample/functions.cpp
diff --git a/sources/shiboken2/tests/libsample/functions.h b/sources/shiboken6/tests/libsample/functions.h
index cad8b2a33..cad8b2a33 100644
--- a/sources/shiboken2/tests/libsample/functions.h
+++ b/sources/shiboken6/tests/libsample/functions.h
diff --git a/sources/shiboken2/tests/libsample/handle.cpp b/sources/shiboken6/tests/libsample/handle.cpp
index 643eac458..643eac458 100644
--- a/sources/shiboken2/tests/libsample/handle.cpp
+++ b/sources/shiboken6/tests/libsample/handle.cpp
diff --git a/sources/shiboken2/tests/libsample/handle.h b/sources/shiboken6/tests/libsample/handle.h
index 824c28b9a..824c28b9a 100644
--- a/sources/shiboken2/tests/libsample/handle.h
+++ b/sources/shiboken6/tests/libsample/handle.h
diff --git a/sources/shiboken2/tests/libsample/implicitconv.cpp b/sources/shiboken6/tests/libsample/implicitconv.cpp
index 88af0d936..88af0d936 100644
--- a/sources/shiboken2/tests/libsample/implicitconv.cpp
+++ b/sources/shiboken6/tests/libsample/implicitconv.cpp
diff --git a/sources/shiboken2/tests/libsample/implicitconv.h b/sources/shiboken6/tests/libsample/implicitconv.h
index ea859a1a6..ea859a1a6 100644
--- a/sources/shiboken2/tests/libsample/implicitconv.h
+++ b/sources/shiboken6/tests/libsample/implicitconv.h
diff --git a/sources/shiboken2/tests/libsample/injectcode.cpp b/sources/shiboken6/tests/libsample/injectcode.cpp
index b1cf2d26b..b1cf2d26b 100644
--- a/sources/shiboken2/tests/libsample/injectcode.cpp
+++ b/sources/shiboken6/tests/libsample/injectcode.cpp
diff --git a/sources/shiboken2/tests/libsample/injectcode.h b/sources/shiboken6/tests/libsample/injectcode.h
index 927721f8f..927721f8f 100644
--- a/sources/shiboken2/tests/libsample/injectcode.h
+++ b/sources/shiboken6/tests/libsample/injectcode.h
diff --git a/sources/shiboken2/tests/libsample/libsamplemacros.h b/sources/shiboken6/tests/libsample/libsamplemacros.h
index cda029ab7..cda029ab7 100644
--- a/sources/shiboken2/tests/libsample/libsamplemacros.h
+++ b/sources/shiboken6/tests/libsample/libsamplemacros.h
diff --git a/sources/shiboken2/tests/libsample/list.h b/sources/shiboken6/tests/libsample/list.h
index f4970d947..f4970d947 100644
--- a/sources/shiboken2/tests/libsample/list.h
+++ b/sources/shiboken6/tests/libsample/list.h
diff --git a/sources/shiboken2/tests/libsample/listuser.cpp b/sources/shiboken6/tests/libsample/listuser.cpp
index b50ce1e4c..b50ce1e4c 100644
--- a/sources/shiboken2/tests/libsample/listuser.cpp
+++ b/sources/shiboken6/tests/libsample/listuser.cpp
diff --git a/sources/shiboken2/tests/libsample/listuser.h b/sources/shiboken6/tests/libsample/listuser.h
index 7e67039d9..7e67039d9 100644
--- a/sources/shiboken2/tests/libsample/listuser.h
+++ b/sources/shiboken6/tests/libsample/listuser.h
diff --git a/sources/shiboken2/tests/libsample/main.cpp b/sources/shiboken6/tests/libsample/main.cpp
index 336551ea2..336551ea2 100644
--- a/sources/shiboken2/tests/libsample/main.cpp
+++ b/sources/shiboken6/tests/libsample/main.cpp
diff --git a/sources/shiboken2/tests/libsample/mapuser.cpp b/sources/shiboken6/tests/libsample/mapuser.cpp
index 89a835af8..89a835af8 100644
--- a/sources/shiboken2/tests/libsample/mapuser.cpp
+++ b/sources/shiboken6/tests/libsample/mapuser.cpp
diff --git a/sources/shiboken2/tests/libsample/mapuser.h b/sources/shiboken6/tests/libsample/mapuser.h
index ad434b957..ad434b957 100644
--- a/sources/shiboken2/tests/libsample/mapuser.h
+++ b/sources/shiboken6/tests/libsample/mapuser.h
diff --git a/sources/shiboken2/tests/libsample/modelindex.h b/sources/shiboken6/tests/libsample/modelindex.h
index dd3ddc089..dd3ddc089 100644
--- a/sources/shiboken2/tests/libsample/modelindex.h
+++ b/sources/shiboken6/tests/libsample/modelindex.h
diff --git a/sources/shiboken2/tests/libsample/modifications.cpp b/sources/shiboken6/tests/libsample/modifications.cpp
index 627d17b45..627d17b45 100644
--- a/sources/shiboken2/tests/libsample/modifications.cpp
+++ b/sources/shiboken6/tests/libsample/modifications.cpp
diff --git a/sources/shiboken2/tests/libsample/modifications.h b/sources/shiboken6/tests/libsample/modifications.h
index 888c66d18..888c66d18 100644
--- a/sources/shiboken2/tests/libsample/modifications.h
+++ b/sources/shiboken6/tests/libsample/modifications.h
diff --git a/sources/shiboken2/tests/libsample/modified_constructor.cpp b/sources/shiboken6/tests/libsample/modified_constructor.cpp
index 015cf4e80..015cf4e80 100644
--- a/sources/shiboken2/tests/libsample/modified_constructor.cpp
+++ b/sources/shiboken6/tests/libsample/modified_constructor.cpp
diff --git a/sources/shiboken2/tests/libsample/modified_constructor.h b/sources/shiboken6/tests/libsample/modified_constructor.h
index ccf23a1a3..ccf23a1a3 100644
--- a/sources/shiboken2/tests/libsample/modified_constructor.h
+++ b/sources/shiboken6/tests/libsample/modified_constructor.h
diff --git a/sources/shiboken2/tests/libsample/multiple_derived.cpp b/sources/shiboken6/tests/libsample/multiple_derived.cpp
index 2c6a0b8bb..2c6a0b8bb 100644
--- a/sources/shiboken2/tests/libsample/multiple_derived.cpp
+++ b/sources/shiboken6/tests/libsample/multiple_derived.cpp
diff --git a/sources/shiboken2/tests/libsample/multiple_derived.h b/sources/shiboken6/tests/libsample/multiple_derived.h
index b551eda74..b551eda74 100644
--- a/sources/shiboken2/tests/libsample/multiple_derived.h
+++ b/sources/shiboken6/tests/libsample/multiple_derived.h
diff --git a/sources/shiboken2/tests/libsample/noimplicitconversion.h b/sources/shiboken6/tests/libsample/noimplicitconversion.h
index 3173f4609..3173f4609 100644
--- a/sources/shiboken2/tests/libsample/noimplicitconversion.h
+++ b/sources/shiboken6/tests/libsample/noimplicitconversion.h
diff --git a/sources/shiboken2/tests/libsample/nondefaultctor.h b/sources/shiboken6/tests/libsample/nondefaultctor.h
index bfdcbcf5b..bfdcbcf5b 100644
--- a/sources/shiboken2/tests/libsample/nondefaultctor.h
+++ b/sources/shiboken6/tests/libsample/nondefaultctor.h
diff --git a/sources/shiboken2/tests/libsample/nontypetemplate.h b/sources/shiboken6/tests/libsample/nontypetemplate.h
index 5a9e670c6..5a9e670c6 100644
--- a/sources/shiboken2/tests/libsample/nontypetemplate.h
+++ b/sources/shiboken6/tests/libsample/nontypetemplate.h
diff --git a/sources/shiboken2/tests/libsample/null.h b/sources/shiboken6/tests/libsample/null.h
index ea34ff5a0..ea34ff5a0 100644
--- a/sources/shiboken2/tests/libsample/null.h
+++ b/sources/shiboken6/tests/libsample/null.h
diff --git a/sources/shiboken2/tests/libsample/objectmodel.cpp b/sources/shiboken6/tests/libsample/objectmodel.cpp
index c92fb2ec2..c92fb2ec2 100644
--- a/sources/shiboken2/tests/libsample/objectmodel.cpp
+++ b/sources/shiboken6/tests/libsample/objectmodel.cpp
diff --git a/sources/shiboken2/tests/libsample/objectmodel.h b/sources/shiboken6/tests/libsample/objectmodel.h
index 1890ac47f..1890ac47f 100644
--- a/sources/shiboken2/tests/libsample/objectmodel.h
+++ b/sources/shiboken6/tests/libsample/objectmodel.h
diff --git a/sources/shiboken2/tests/libsample/objecttype.cpp b/sources/shiboken6/tests/libsample/objecttype.cpp
index afaaa9d77..afaaa9d77 100644
--- a/sources/shiboken2/tests/libsample/objecttype.cpp
+++ b/sources/shiboken6/tests/libsample/objecttype.cpp
diff --git a/sources/shiboken2/tests/libsample/objecttype.h b/sources/shiboken6/tests/libsample/objecttype.h
index caa50f02e..caa50f02e 100644
--- a/sources/shiboken2/tests/libsample/objecttype.h
+++ b/sources/shiboken6/tests/libsample/objecttype.h
diff --git a/sources/shiboken2/tests/libsample/objecttypebyvalue.h b/sources/shiboken6/tests/libsample/objecttypebyvalue.h
index 64fa78c83..64fa78c83 100644
--- a/sources/shiboken2/tests/libsample/objecttypebyvalue.h
+++ b/sources/shiboken6/tests/libsample/objecttypebyvalue.h
diff --git a/sources/shiboken2/tests/libsample/objecttypeholder.cpp b/sources/shiboken6/tests/libsample/objecttypeholder.cpp
index be225a0d2..be225a0d2 100644
--- a/sources/shiboken2/tests/libsample/objecttypeholder.cpp
+++ b/sources/shiboken6/tests/libsample/objecttypeholder.cpp
diff --git a/sources/shiboken2/tests/libsample/objecttypeholder.h b/sources/shiboken6/tests/libsample/objecttypeholder.h
index 7558b11ee..7558b11ee 100644
--- a/sources/shiboken2/tests/libsample/objecttypeholder.h
+++ b/sources/shiboken6/tests/libsample/objecttypeholder.h
diff --git a/sources/shiboken2/tests/libsample/objecttypelayout.cpp b/sources/shiboken6/tests/libsample/objecttypelayout.cpp
index 6f3d0eba9..6f3d0eba9 100644
--- a/sources/shiboken2/tests/libsample/objecttypelayout.cpp
+++ b/sources/shiboken6/tests/libsample/objecttypelayout.cpp
diff --git a/sources/shiboken2/tests/libsample/objecttypelayout.h b/sources/shiboken6/tests/libsample/objecttypelayout.h
index eb099313c..eb099313c 100644
--- a/sources/shiboken2/tests/libsample/objecttypelayout.h
+++ b/sources/shiboken6/tests/libsample/objecttypelayout.h
diff --git a/sources/shiboken2/tests/libsample/objecttypeoperators.cpp b/sources/shiboken6/tests/libsample/objecttypeoperators.cpp
index dc5243f2e..dc5243f2e 100644
--- a/sources/shiboken2/tests/libsample/objecttypeoperators.cpp
+++ b/sources/shiboken6/tests/libsample/objecttypeoperators.cpp
diff --git a/sources/shiboken2/tests/libsample/objecttypeoperators.h b/sources/shiboken6/tests/libsample/objecttypeoperators.h
index 6bb54d600..6bb54d600 100644
--- a/sources/shiboken2/tests/libsample/objecttypeoperators.h
+++ b/sources/shiboken6/tests/libsample/objecttypeoperators.h
diff --git a/sources/shiboken2/tests/libsample/objectview.cpp b/sources/shiboken6/tests/libsample/objectview.cpp
index d640c406e..d640c406e 100644
--- a/sources/shiboken2/tests/libsample/objectview.cpp
+++ b/sources/shiboken6/tests/libsample/objectview.cpp
diff --git a/sources/shiboken2/tests/libsample/objectview.h b/sources/shiboken6/tests/libsample/objectview.h
index b68d031e9..b68d031e9 100644
--- a/sources/shiboken2/tests/libsample/objectview.h
+++ b/sources/shiboken6/tests/libsample/objectview.h
diff --git a/sources/shiboken2/tests/libsample/oddbool.cpp b/sources/shiboken6/tests/libsample/oddbool.cpp
index 4f491dd96..4f491dd96 100644
--- a/sources/shiboken2/tests/libsample/oddbool.cpp
+++ b/sources/shiboken6/tests/libsample/oddbool.cpp
diff --git a/sources/shiboken2/tests/libsample/oddbool.h b/sources/shiboken6/tests/libsample/oddbool.h
index f7d77c0b3..f7d77c0b3 100644
--- a/sources/shiboken2/tests/libsample/oddbool.h
+++ b/sources/shiboken6/tests/libsample/oddbool.h
diff --git a/sources/shiboken2/tests/libsample/onlycopy.cpp b/sources/shiboken6/tests/libsample/onlycopy.cpp
index cfc7c9d99..cfc7c9d99 100644
--- a/sources/shiboken2/tests/libsample/onlycopy.cpp
+++ b/sources/shiboken6/tests/libsample/onlycopy.cpp
diff --git a/sources/shiboken2/tests/libsample/onlycopy.h b/sources/shiboken6/tests/libsample/onlycopy.h
index 84a32a951..84a32a951 100644
--- a/sources/shiboken2/tests/libsample/onlycopy.h
+++ b/sources/shiboken6/tests/libsample/onlycopy.h
diff --git a/sources/shiboken2/tests/libsample/overload.cpp b/sources/shiboken6/tests/libsample/overload.cpp
index ebf19586e..ebf19586e 100644
--- a/sources/shiboken2/tests/libsample/overload.cpp
+++ b/sources/shiboken6/tests/libsample/overload.cpp
diff --git a/sources/shiboken2/tests/libsample/overload.h b/sources/shiboken6/tests/libsample/overload.h
index aa2572d50..aa2572d50 100644
--- a/sources/shiboken2/tests/libsample/overload.h
+++ b/sources/shiboken6/tests/libsample/overload.h
diff --git a/sources/shiboken2/tests/libsample/overloadsort.cpp b/sources/shiboken6/tests/libsample/overloadsort.cpp
index 8534ef0f1..8534ef0f1 100644
--- a/sources/shiboken2/tests/libsample/overloadsort.cpp
+++ b/sources/shiboken6/tests/libsample/overloadsort.cpp
diff --git a/sources/shiboken2/tests/libsample/overloadsort.h b/sources/shiboken6/tests/libsample/overloadsort.h
index ad720222c..ad720222c 100644
--- a/sources/shiboken2/tests/libsample/overloadsort.h
+++ b/sources/shiboken6/tests/libsample/overloadsort.h
diff --git a/sources/shiboken2/tests/libsample/pairuser.cpp b/sources/shiboken6/tests/libsample/pairuser.cpp
index 661988445..661988445 100644
--- a/sources/shiboken2/tests/libsample/pairuser.cpp
+++ b/sources/shiboken6/tests/libsample/pairuser.cpp
diff --git a/sources/shiboken2/tests/libsample/pairuser.h b/sources/shiboken6/tests/libsample/pairuser.h
index 37219f724..37219f724 100644
--- a/sources/shiboken2/tests/libsample/pairuser.h
+++ b/sources/shiboken6/tests/libsample/pairuser.h
diff --git a/sources/shiboken2/tests/libsample/pen.cpp b/sources/shiboken6/tests/libsample/pen.cpp
index 1f39e7cbb..1f39e7cbb 100644
--- a/sources/shiboken2/tests/libsample/pen.cpp
+++ b/sources/shiboken6/tests/libsample/pen.cpp
diff --git a/sources/shiboken2/tests/libsample/pen.h b/sources/shiboken6/tests/libsample/pen.h
index 20977fdeb..20977fdeb 100644
--- a/sources/shiboken2/tests/libsample/pen.h
+++ b/sources/shiboken6/tests/libsample/pen.h
diff --git a/sources/shiboken2/tests/libsample/photon.cpp b/sources/shiboken6/tests/libsample/photon.cpp
index e61fd5969..e61fd5969 100644
--- a/sources/shiboken2/tests/libsample/photon.cpp
+++ b/sources/shiboken6/tests/libsample/photon.cpp
diff --git a/sources/shiboken2/tests/libsample/photon.h b/sources/shiboken6/tests/libsample/photon.h
index 1dcb4f83e..1dcb4f83e 100644
--- a/sources/shiboken2/tests/libsample/photon.h
+++ b/sources/shiboken6/tests/libsample/photon.h
diff --git a/sources/shiboken2/tests/libsample/point.cpp b/sources/shiboken6/tests/libsample/point.cpp
index 75e015e07..75e015e07 100644
--- a/sources/shiboken2/tests/libsample/point.cpp
+++ b/sources/shiboken6/tests/libsample/point.cpp
diff --git a/sources/shiboken2/tests/libsample/point.h b/sources/shiboken6/tests/libsample/point.h
index 579bcd515..579bcd515 100644
--- a/sources/shiboken2/tests/libsample/point.h
+++ b/sources/shiboken6/tests/libsample/point.h
diff --git a/sources/shiboken2/tests/libsample/pointerholder.h b/sources/shiboken6/tests/libsample/pointerholder.h
index b872ceb5c..b872ceb5c 100644
--- a/sources/shiboken2/tests/libsample/pointerholder.h
+++ b/sources/shiboken6/tests/libsample/pointerholder.h
diff --git a/sources/shiboken2/tests/libsample/pointf.cpp b/sources/shiboken6/tests/libsample/pointf.cpp
index fadf3e591..fadf3e591 100644
--- a/sources/shiboken2/tests/libsample/pointf.cpp
+++ b/sources/shiboken6/tests/libsample/pointf.cpp
diff --git a/sources/shiboken2/tests/libsample/pointf.h b/sources/shiboken6/tests/libsample/pointf.h
index f90125c8a..f90125c8a 100644
--- a/sources/shiboken2/tests/libsample/pointf.h
+++ b/sources/shiboken6/tests/libsample/pointf.h
diff --git a/sources/shiboken2/tests/libsample/polygon.cpp b/sources/shiboken6/tests/libsample/polygon.cpp
index fc0526db2..fc0526db2 100644
--- a/sources/shiboken2/tests/libsample/polygon.cpp
+++ b/sources/shiboken6/tests/libsample/polygon.cpp
diff --git a/sources/shiboken2/tests/libsample/polygon.h b/sources/shiboken6/tests/libsample/polygon.h
index 728332d1a..728332d1a 100644
--- a/sources/shiboken2/tests/libsample/polygon.h
+++ b/sources/shiboken6/tests/libsample/polygon.h
diff --git a/sources/shiboken2/tests/libsample/privatector.h b/sources/shiboken6/tests/libsample/privatector.h
index f168fdacd..f168fdacd 100644
--- a/sources/shiboken2/tests/libsample/privatector.h
+++ b/sources/shiboken6/tests/libsample/privatector.h
diff --git a/sources/shiboken2/tests/libsample/privatedtor.h b/sources/shiboken6/tests/libsample/privatedtor.h
index 64b8652f6..64b8652f6 100644
--- a/sources/shiboken2/tests/libsample/privatedtor.h
+++ b/sources/shiboken6/tests/libsample/privatedtor.h
diff --git a/sources/shiboken2/tests/libsample/protected.cpp b/sources/shiboken6/tests/libsample/protected.cpp
index b0f3f1cdc..b0f3f1cdc 100644
--- a/sources/shiboken2/tests/libsample/protected.cpp
+++ b/sources/shiboken6/tests/libsample/protected.cpp
diff --git a/sources/shiboken2/tests/libsample/protected.h b/sources/shiboken6/tests/libsample/protected.h
index 0f4fbf299..0f4fbf299 100644
--- a/sources/shiboken2/tests/libsample/protected.h
+++ b/sources/shiboken6/tests/libsample/protected.h
diff --git a/sources/shiboken2/tests/libsample/rect.h b/sources/shiboken6/tests/libsample/rect.h
index 1897a8dce..1897a8dce 100644
--- a/sources/shiboken2/tests/libsample/rect.h
+++ b/sources/shiboken6/tests/libsample/rect.h
diff --git a/sources/shiboken2/tests/libsample/reference.cpp b/sources/shiboken6/tests/libsample/reference.cpp
index 37ce1a590..37ce1a590 100644
--- a/sources/shiboken2/tests/libsample/reference.cpp
+++ b/sources/shiboken6/tests/libsample/reference.cpp
diff --git a/sources/shiboken2/tests/libsample/reference.h b/sources/shiboken6/tests/libsample/reference.h
index 2c0498c6f..2c0498c6f 100644
--- a/sources/shiboken2/tests/libsample/reference.h
+++ b/sources/shiboken6/tests/libsample/reference.h
diff --git a/sources/shiboken2/tests/libsample/removednamespaces.h b/sources/shiboken6/tests/libsample/removednamespaces.h
index 47c18c049..47c18c049 100644
--- a/sources/shiboken2/tests/libsample/removednamespaces.h
+++ b/sources/shiboken6/tests/libsample/removednamespaces.h
diff --git a/sources/shiboken2/tests/libsample/renaming.cpp b/sources/shiboken6/tests/libsample/renaming.cpp
index 30586e1db..30586e1db 100644
--- a/sources/shiboken2/tests/libsample/renaming.cpp
+++ b/sources/shiboken6/tests/libsample/renaming.cpp
diff --git a/sources/shiboken2/tests/libsample/renaming.h b/sources/shiboken6/tests/libsample/renaming.h
index cd88b36bf..cd88b36bf 100644
--- a/sources/shiboken2/tests/libsample/renaming.h
+++ b/sources/shiboken6/tests/libsample/renaming.h
diff --git a/sources/shiboken2/tests/libsample/sample.cpp b/sources/shiboken6/tests/libsample/sample.cpp
index 638413fd2..638413fd2 100644
--- a/sources/shiboken2/tests/libsample/sample.cpp
+++ b/sources/shiboken6/tests/libsample/sample.cpp
diff --git a/sources/shiboken2/tests/libsample/sample.h b/sources/shiboken6/tests/libsample/sample.h
index fe76a53b2..fe76a53b2 100644
--- a/sources/shiboken2/tests/libsample/sample.h
+++ b/sources/shiboken6/tests/libsample/sample.h
diff --git a/sources/shiboken2/tests/libsample/samplenamespace.cpp b/sources/shiboken6/tests/libsample/samplenamespace.cpp
index b3ef96f5a..b3ef96f5a 100644
--- a/sources/shiboken2/tests/libsample/samplenamespace.cpp
+++ b/sources/shiboken6/tests/libsample/samplenamespace.cpp
diff --git a/sources/shiboken2/tests/libsample/samplenamespace.h b/sources/shiboken6/tests/libsample/samplenamespace.h
index 5fe269c5e..5fe269c5e 100644
--- a/sources/shiboken2/tests/libsample/samplenamespace.h
+++ b/sources/shiboken6/tests/libsample/samplenamespace.h
diff --git a/sources/shiboken2/tests/libsample/sbkdate.cpp b/sources/shiboken6/tests/libsample/sbkdate.cpp
index 8ba18af43..8ba18af43 100644
--- a/sources/shiboken2/tests/libsample/sbkdate.cpp
+++ b/sources/shiboken6/tests/libsample/sbkdate.cpp
diff --git a/sources/shiboken2/tests/libsample/sbkdate.h b/sources/shiboken6/tests/libsample/sbkdate.h
index bbe3d3ca8..bbe3d3ca8 100644
--- a/sources/shiboken2/tests/libsample/sbkdate.h
+++ b/sources/shiboken6/tests/libsample/sbkdate.h
diff --git a/sources/shiboken2/tests/libsample/simplefile.cpp b/sources/shiboken6/tests/libsample/simplefile.cpp
index 3b68e02c3..3b68e02c3 100644
--- a/sources/shiboken2/tests/libsample/simplefile.cpp
+++ b/sources/shiboken6/tests/libsample/simplefile.cpp
diff --git a/sources/shiboken2/tests/libsample/simplefile.h b/sources/shiboken6/tests/libsample/simplefile.h
index 7a437a99d..7a437a99d 100644
--- a/sources/shiboken2/tests/libsample/simplefile.h
+++ b/sources/shiboken6/tests/libsample/simplefile.h
diff --git a/sources/shiboken2/tests/libsample/size.cpp b/sources/shiboken6/tests/libsample/size.cpp
index 4c195161e..4c195161e 100644
--- a/sources/shiboken2/tests/libsample/size.cpp
+++ b/sources/shiboken6/tests/libsample/size.cpp
diff --git a/sources/shiboken2/tests/libsample/size.h b/sources/shiboken6/tests/libsample/size.h
index 76502b416..76502b416 100644
--- a/sources/shiboken2/tests/libsample/size.h
+++ b/sources/shiboken6/tests/libsample/size.h
diff --git a/sources/shiboken2/tests/libsample/sometime.cpp b/sources/shiboken6/tests/libsample/sometime.cpp
index 851b3b913..851b3b913 100644
--- a/sources/shiboken2/tests/libsample/sometime.cpp
+++ b/sources/shiboken6/tests/libsample/sometime.cpp
diff --git a/sources/shiboken2/tests/libsample/sometime.h b/sources/shiboken6/tests/libsample/sometime.h
index ef16efa29..ef16efa29 100644
--- a/sources/shiboken2/tests/libsample/sometime.h
+++ b/sources/shiboken6/tests/libsample/sometime.h
diff --git a/sources/shiboken2/tests/libsample/str.cpp b/sources/shiboken6/tests/libsample/str.cpp
index 634bd4a86..634bd4a86 100644
--- a/sources/shiboken2/tests/libsample/str.cpp
+++ b/sources/shiboken6/tests/libsample/str.cpp
diff --git a/sources/shiboken2/tests/libsample/str.h b/sources/shiboken6/tests/libsample/str.h
index 2f7cee8c3..2f7cee8c3 100644
--- a/sources/shiboken2/tests/libsample/str.h
+++ b/sources/shiboken6/tests/libsample/str.h
diff --git a/sources/shiboken2/tests/libsample/strlist.cpp b/sources/shiboken6/tests/libsample/strlist.cpp
index e523522f3..e523522f3 100644
--- a/sources/shiboken2/tests/libsample/strlist.cpp
+++ b/sources/shiboken6/tests/libsample/strlist.cpp
diff --git a/sources/shiboken2/tests/libsample/strlist.h b/sources/shiboken6/tests/libsample/strlist.h
index 43aa15390..43aa15390 100644
--- a/sources/shiboken2/tests/libsample/strlist.h
+++ b/sources/shiboken6/tests/libsample/strlist.h
diff --git a/sources/shiboken2/tests/libsample/templateptr.cpp b/sources/shiboken6/tests/libsample/templateptr.cpp
index fa5bb8206..fa5bb8206 100644
--- a/sources/shiboken2/tests/libsample/templateptr.cpp
+++ b/sources/shiboken6/tests/libsample/templateptr.cpp
diff --git a/sources/shiboken2/tests/libsample/templateptr.h b/sources/shiboken6/tests/libsample/templateptr.h
index 584b64185..584b64185 100644
--- a/sources/shiboken2/tests/libsample/templateptr.h
+++ b/sources/shiboken6/tests/libsample/templateptr.h
diff --git a/sources/shiboken2/tests/libsample/transform.cpp b/sources/shiboken6/tests/libsample/transform.cpp
index 840f1feac..840f1feac 100644
--- a/sources/shiboken2/tests/libsample/transform.cpp
+++ b/sources/shiboken6/tests/libsample/transform.cpp
diff --git a/sources/shiboken2/tests/libsample/transform.h b/sources/shiboken6/tests/libsample/transform.h
index d9ec98dd4..d9ec98dd4 100644
--- a/sources/shiboken2/tests/libsample/transform.h
+++ b/sources/shiboken6/tests/libsample/transform.h
diff --git a/sources/shiboken2/tests/libsample/typesystypedef.cpp b/sources/shiboken6/tests/libsample/typesystypedef.cpp
index 16777bf32..16777bf32 100644
--- a/sources/shiboken2/tests/libsample/typesystypedef.cpp
+++ b/sources/shiboken6/tests/libsample/typesystypedef.cpp
diff --git a/sources/shiboken2/tests/libsample/typesystypedef.h b/sources/shiboken6/tests/libsample/typesystypedef.h
index 228381c5f..228381c5f 100644
--- a/sources/shiboken2/tests/libsample/typesystypedef.h
+++ b/sources/shiboken6/tests/libsample/typesystypedef.h
diff --git a/sources/shiboken2/tests/libsample/valueandvirtual.h b/sources/shiboken6/tests/libsample/valueandvirtual.h
index 34a6788e2..34a6788e2 100644
--- a/sources/shiboken2/tests/libsample/valueandvirtual.h
+++ b/sources/shiboken6/tests/libsample/valueandvirtual.h
diff --git a/sources/shiboken2/tests/libsample/virtualmethods.cpp b/sources/shiboken6/tests/libsample/virtualmethods.cpp
index 705835c0b..705835c0b 100644
--- a/sources/shiboken2/tests/libsample/virtualmethods.cpp
+++ b/sources/shiboken6/tests/libsample/virtualmethods.cpp
diff --git a/sources/shiboken2/tests/libsample/virtualmethods.h b/sources/shiboken6/tests/libsample/virtualmethods.h
index 577f6919e..577f6919e 100644
--- a/sources/shiboken2/tests/libsample/virtualmethods.h
+++ b/sources/shiboken6/tests/libsample/virtualmethods.h
diff --git a/sources/shiboken2/tests/libsample/voidholder.h b/sources/shiboken6/tests/libsample/voidholder.h
index 367e99ddf..367e99ddf 100644
--- a/sources/shiboken2/tests/libsample/voidholder.h
+++ b/sources/shiboken6/tests/libsample/voidholder.h
diff --git a/sources/shiboken2/tests/libsmart/CMakeLists.txt b/sources/shiboken6/tests/libsmart/CMakeLists.txt
index 152c57f25..152c57f25 100644
--- a/sources/shiboken2/tests/libsmart/CMakeLists.txt
+++ b/sources/shiboken6/tests/libsmart/CMakeLists.txt
diff --git a/sources/shiboken2/tests/libsmart/libsmartmacros.h b/sources/shiboken6/tests/libsmart/libsmartmacros.h
index d85e219bb..d85e219bb 100644
--- a/sources/shiboken2/tests/libsmart/libsmartmacros.h
+++ b/sources/shiboken6/tests/libsmart/libsmartmacros.h
diff --git a/sources/shiboken2/tests/libsmart/smart.cpp b/sources/shiboken6/tests/libsmart/smart.cpp
index 81fa30c7e..81fa30c7e 100644
--- a/sources/shiboken2/tests/libsmart/smart.cpp
+++ b/sources/shiboken6/tests/libsmart/smart.cpp
diff --git a/sources/shiboken2/tests/libsmart/smart.h b/sources/shiboken6/tests/libsmart/smart.h
index 6238f27d5..6238f27d5 100644
--- a/sources/shiboken2/tests/libsmart/smart.h
+++ b/sources/shiboken6/tests/libsmart/smart.h
diff --git a/sources/shiboken2/tests/libsmart/smart_integer.h b/sources/shiboken6/tests/libsmart/smart_integer.h
index 126894120..126894120 100644
--- a/sources/shiboken2/tests/libsmart/smart_integer.h
+++ b/sources/shiboken6/tests/libsmart/smart_integer.h
diff --git a/sources/shiboken2/tests/libsmart/smart_obj.h b/sources/shiboken6/tests/libsmart/smart_obj.h
index 8fe45993f..8fe45993f 100644
--- a/sources/shiboken2/tests/libsmart/smart_obj.h
+++ b/sources/shiboken6/tests/libsmart/smart_obj.h
diff --git a/sources/shiboken2/tests/libsmart/smart_registry.h b/sources/shiboken6/tests/libsmart/smart_registry.h
index 6171ddb59..6171ddb59 100644
--- a/sources/shiboken2/tests/libsmart/smart_registry.h
+++ b/sources/shiboken6/tests/libsmart/smart_registry.h
diff --git a/sources/shiboken2/tests/libsmart/smart_sharedptr.h b/sources/shiboken6/tests/libsmart/smart_sharedptr.h
index 65a489c68..65a489c68 100644
--- a/sources/shiboken2/tests/libsmart/smart_sharedptr.h
+++ b/sources/shiboken6/tests/libsmart/smart_sharedptr.h
diff --git a/sources/shiboken2/tests/minimalbinding/CMakeLists.txt b/sources/shiboken6/tests/minimalbinding/CMakeLists.txt
index ffeb086a0..63ad8a577 100644
--- a/sources/shiboken2/tests/minimalbinding/CMakeLists.txt
+++ b/sources/shiboken6/tests/minimalbinding/CMakeLists.txt
@@ -18,8 +18,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/minimal-binding.txt.in"
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
 BYPRODUCTS ${minimal_SRC}
-COMMAND shiboken2 --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS}
-DEPENDS ${minimal_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken2
+COMMAND shiboken6 --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS}
+DEPENDS ${minimal_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken6
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'minimal' test binding..."
 )
diff --git a/sources/shiboken2/tests/minimalbinding/brace_pattern_test.py b/sources/shiboken6/tests/minimalbinding/brace_pattern_test.py
index 550a609cb..4afd46b91 100644
--- a/sources/shiboken2/tests/minimalbinding/brace_pattern_test.py
+++ b/sources/shiboken6/tests/minimalbinding/brace_pattern_test.py
@@ -48,7 +48,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from shiboken_paths import init_paths
 init_paths()
 
-import shiboken2
+import shiboken6
 _init_pyside_extension()   # trigger bootstrap
 
 from shibokensupport.signature.lib.tool import build_brace_pattern
diff --git a/sources/shiboken2/tests/minimalbinding/global.h b/sources/shiboken6/tests/minimalbinding/global.h
index 1b06245c4..1b06245c4 100644
--- a/sources/shiboken2/tests/minimalbinding/global.h
+++ b/sources/shiboken6/tests/minimalbinding/global.h
diff --git a/sources/shiboken2/tests/minimalbinding/listuser_test.py b/sources/shiboken6/tests/minimalbinding/listuser_test.py
index 3668cb55f..3668cb55f 100644
--- a/sources/shiboken2/tests/minimalbinding/listuser_test.py
+++ b/sources/shiboken6/tests/minimalbinding/listuser_test.py
diff --git a/sources/shiboken2/tests/minimalbinding/minbool_test.py b/sources/shiboken6/tests/minimalbinding/minbool_test.py
index adc0929fd..adc0929fd 100644
--- a/sources/shiboken2/tests/minimalbinding/minbool_test.py
+++ b/sources/shiboken6/tests/minimalbinding/minbool_test.py
diff --git a/sources/shiboken2/tests/minimalbinding/minimal-binding.txt.in b/sources/shiboken6/tests/minimalbinding/minimal-binding.txt.in
index 85b139676..85b139676 100644
--- a/sources/shiboken2/tests/minimalbinding/minimal-binding.txt.in
+++ b/sources/shiboken6/tests/minimalbinding/minimal-binding.txt.in
diff --git a/sources/shiboken2/tests/minimalbinding/obj_test.py b/sources/shiboken6/tests/minimalbinding/obj_test.py
index a0869a67b..a0869a67b 100644
--- a/sources/shiboken2/tests/minimalbinding/obj_test.py
+++ b/sources/shiboken6/tests/minimalbinding/obj_test.py
diff --git a/sources/shiboken2/tests/minimalbinding/typedef_test.py b/sources/shiboken6/tests/minimalbinding/typedef_test.py
index e8dd5cd16..e8dd5cd16 100644
--- a/sources/shiboken2/tests/minimalbinding/typedef_test.py
+++ b/sources/shiboken6/tests/minimalbinding/typedef_test.py
diff --git a/sources/shiboken2/tests/minimalbinding/typesystem_minimal.xml b/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml
index 03b88a970..03b88a970 100644
--- a/sources/shiboken2/tests/minimalbinding/typesystem_minimal.xml
+++ b/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml
diff --git a/sources/shiboken2/tests/minimalbinding/val_test.py b/sources/shiboken6/tests/minimalbinding/val_test.py
index f97e9487d..f97e9487d 100644
--- a/sources/shiboken2/tests/minimalbinding/val_test.py
+++ b/sources/shiboken6/tests/minimalbinding/val_test.py
diff --git a/sources/shiboken2/tests/otherbinding/CMakeLists.txt b/sources/shiboken6/tests/otherbinding/CMakeLists.txt
index 518e27396..7c8562abc 100644
--- a/sources/shiboken2/tests/otherbinding/CMakeLists.txt
+++ b/sources/shiboken6/tests/otherbinding/CMakeLists.txt
@@ -25,8 +25,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/other-binding.txt.in"
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
 BYPRODUCTS ${other_SRC}
-COMMAND shiboken2 --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt ${GENERATOR_EXTRA_FLAGS}
-DEPENDS ${other_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken2
+COMMAND shiboken6 --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt ${GENERATOR_EXTRA_FLAGS}
+DEPENDS ${other_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken6
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'other' test binding..."
 )
diff --git a/sources/shiboken2/tests/otherbinding/collector_external_operator_test.py b/sources/shiboken6/tests/otherbinding/collector_external_operator_test.py
index 6014b8a59..6014b8a59 100644
--- a/sources/shiboken2/tests/otherbinding/collector_external_operator_test.py
+++ b/sources/shiboken6/tests/otherbinding/collector_external_operator_test.py
diff --git a/sources/shiboken2/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py b/sources/shiboken6/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py
index 1e992ebc8..1e992ebc8 100644
--- a/sources/shiboken2/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py
+++ b/sources/shiboken6/tests/otherbinding/conversion_operator_for_class_without_implicit_conversions_test.py
diff --git a/sources/shiboken2/tests/otherbinding/extended_multiply_operator_test.py b/sources/shiboken6/tests/otherbinding/extended_multiply_operator_test.py
index 5ad4763b7..5ad4763b7 100644
--- a/sources/shiboken2/tests/otherbinding/extended_multiply_operator_test.py
+++ b/sources/shiboken6/tests/otherbinding/extended_multiply_operator_test.py
diff --git a/sources/shiboken2/tests/otherbinding/global.h b/sources/shiboken6/tests/otherbinding/global.h
index 702fb9287..702fb9287 100644
--- a/sources/shiboken2/tests/otherbinding/global.h
+++ b/sources/shiboken6/tests/otherbinding/global.h
diff --git a/sources/shiboken2/tests/otherbinding/module_reload_test.py b/sources/shiboken6/tests/otherbinding/module_reload_test.py
index c63af188e..c63af188e 100644
--- a/sources/shiboken2/tests/otherbinding/module_reload_test.py
+++ b/sources/shiboken6/tests/otherbinding/module_reload_test.py
diff --git a/sources/shiboken2/tests/otherbinding/new_ctor_operator_test.py b/sources/shiboken6/tests/otherbinding/new_ctor_operator_test.py
index 84dfe9839..84dfe9839 100644
--- a/sources/shiboken2/tests/otherbinding/new_ctor_operator_test.py
+++ b/sources/shiboken6/tests/otherbinding/new_ctor_operator_test.py
diff --git a/sources/shiboken2/tests/otherbinding/objtypehashes_test.py b/sources/shiboken6/tests/otherbinding/objtypehashes_test.py
index 92f93a090..dc3ae1eb0 100644
--- a/sources/shiboken2/tests/otherbinding/objtypehashes_test.py
+++ b/sources/shiboken6/tests/otherbinding/objtypehashes_test.py
@@ -35,7 +35,7 @@ from shiboken_paths import init_paths
 init_paths()
 from sample import *
 from other import *
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 class TestHashFuncs (unittest.TestCase):
 
diff --git a/sources/shiboken2/tests/otherbinding/other-binding.txt.in b/sources/shiboken6/tests/otherbinding/other-binding.txt.in
index dbe935a9f..dbe935a9f 100644
--- a/sources/shiboken2/tests/otherbinding/other-binding.txt.in
+++ b/sources/shiboken6/tests/otherbinding/other-binding.txt.in
diff --git a/sources/shiboken2/tests/otherbinding/otherderived_test.py b/sources/shiboken6/tests/otherbinding/otherderived_test.py
index d8dc9b686..d8dc9b686 100644
--- a/sources/shiboken2/tests/otherbinding/otherderived_test.py
+++ b/sources/shiboken6/tests/otherbinding/otherderived_test.py
diff --git a/sources/shiboken2/tests/otherbinding/othertypesystypedef_test.py b/sources/shiboken6/tests/otherbinding/othertypesystypedef_test.py
index aafeb4973..aafeb4973 100644
--- a/sources/shiboken2/tests/otherbinding/othertypesystypedef_test.py
+++ b/sources/shiboken6/tests/otherbinding/othertypesystypedef_test.py
diff --git a/sources/shiboken2/tests/otherbinding/signature_test.py b/sources/shiboken6/tests/otherbinding/signature_test.py
index f3b712d04..f3b712d04 100644
--- a/sources/shiboken2/tests/otherbinding/signature_test.py
+++ b/sources/shiboken6/tests/otherbinding/signature_test.py
diff --git a/sources/shiboken2/tests/otherbinding/smartptr_test.py b/sources/shiboken6/tests/otherbinding/smartptr_test.py
index 04f657757..04f657757 100644
--- a/sources/shiboken2/tests/otherbinding/smartptr_test.py
+++ b/sources/shiboken6/tests/otherbinding/smartptr_test.py
diff --git a/sources/shiboken2/tests/otherbinding/test_module_template.py b/sources/shiboken6/tests/otherbinding/test_module_template.py
index 5d08944f3..5d08944f3 100644
--- a/sources/shiboken2/tests/otherbinding/test_module_template.py
+++ b/sources/shiboken6/tests/otherbinding/test_module_template.py
diff --git a/sources/shiboken2/tests/otherbinding/typediscovery_test.py b/sources/shiboken6/tests/otherbinding/typediscovery_test.py
index 200d091b0..200d091b0 100644
--- a/sources/shiboken2/tests/otherbinding/typediscovery_test.py
+++ b/sources/shiboken6/tests/otherbinding/typediscovery_test.py
diff --git a/sources/shiboken2/tests/otherbinding/typesystem_other.xml b/sources/shiboken6/tests/otherbinding/typesystem_other.xml
index 4081548fc..4081548fc 100644
--- a/sources/shiboken2/tests/otherbinding/typesystem_other.xml
+++ b/sources/shiboken6/tests/otherbinding/typesystem_other.xml
diff --git a/sources/shiboken2/tests/otherbinding/usersprimitivefromothermodule_test.py b/sources/shiboken6/tests/otherbinding/usersprimitivefromothermodule_test.py
index a69ee23f0..a69ee23f0 100644
--- a/sources/shiboken2/tests/otherbinding/usersprimitivefromothermodule_test.py
+++ b/sources/shiboken6/tests/otherbinding/usersprimitivefromothermodule_test.py
diff --git a/sources/shiboken2/tests/otherbinding/wrongctor_test.py b/sources/shiboken6/tests/otherbinding/wrongctor_test.py
index 29d085315..29d085315 100644
--- a/sources/shiboken2/tests/otherbinding/wrongctor_test.py
+++ b/sources/shiboken6/tests/otherbinding/wrongctor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/CMakeLists.txt b/sources/shiboken6/tests/samplebinding/CMakeLists.txt
index 5e4478582..418e47c0d 100644
--- a/sources/shiboken2/tests/samplebinding/CMakeLists.txt
+++ b/sources/shiboken6/tests/samplebinding/CMakeLists.txt
@@ -139,8 +139,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sample-binding.txt.in"
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
 BYPRODUCTS ${sample_SRC}
-COMMAND shiboken2 --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt ${GENERATOR_EXTRA_FLAGS}
-DEPENDS ${sample_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken2
+COMMAND shiboken6 --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt ${GENERATOR_EXTRA_FLAGS}
+DEPENDS ${sample_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken6
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'sample' test binding..."
 )
diff --git a/sources/shiboken2/tests/samplebinding/__del___test.py b/sources/shiboken6/tests/samplebinding/__del___test.py
index eba837eb8..eba837eb8 100644
--- a/sources/shiboken2/tests/samplebinding/__del___test.py
+++ b/sources/shiboken6/tests/samplebinding/__del___test.py
diff --git a/sources/shiboken2/tests/samplebinding/abstract_test.py b/sources/shiboken6/tests/samplebinding/abstract_test.py
index 23a984870..23a984870 100644
--- a/sources/shiboken2/tests/samplebinding/abstract_test.py
+++ b/sources/shiboken6/tests/samplebinding/abstract_test.py
diff --git a/sources/shiboken2/tests/samplebinding/addedfunction_test.py b/sources/shiboken6/tests/samplebinding/addedfunction_test.py
index d7f5f3994..d7f5f3994 100644
--- a/sources/shiboken2/tests/samplebinding/addedfunction_test.py
+++ b/sources/shiboken6/tests/samplebinding/addedfunction_test.py
diff --git a/sources/shiboken2/tests/samplebinding/addedfunction_with_container_args_test.py b/sources/shiboken6/tests/samplebinding/addedfunction_with_container_args_test.py
index 9666b251c..9666b251c 100644
--- a/sources/shiboken2/tests/samplebinding/addedfunction_with_container_args_test.py
+++ b/sources/shiboken6/tests/samplebinding/addedfunction_with_container_args_test.py
diff --git a/sources/shiboken2/tests/samplebinding/argumentmodifications_test.py b/sources/shiboken6/tests/samplebinding/argumentmodifications_test.py
index 8a2775db3..8a2775db3 100644
--- a/sources/shiboken2/tests/samplebinding/argumentmodifications_test.py
+++ b/sources/shiboken6/tests/samplebinding/argumentmodifications_test.py
diff --git a/sources/shiboken2/tests/samplebinding/array_numpy_test.py b/sources/shiboken6/tests/samplebinding/array_numpy_test.py
index 2c2a2852a..2c2a2852a 100644
--- a/sources/shiboken2/tests/samplebinding/array_numpy_test.py
+++ b/sources/shiboken6/tests/samplebinding/array_numpy_test.py
diff --git a/sources/shiboken2/tests/samplebinding/array_sequence_test.py b/sources/shiboken6/tests/samplebinding/array_sequence_test.py
index 520a5f928..520a5f928 100644
--- a/sources/shiboken2/tests/samplebinding/array_sequence_test.py
+++ b/sources/shiboken6/tests/samplebinding/array_sequence_test.py
diff --git a/sources/shiboken2/tests/samplebinding/bug_554_test.py b/sources/shiboken6/tests/samplebinding/bug_554_test.py
index c1c06a17f..c1c06a17f 100644
--- a/sources/shiboken2/tests/samplebinding/bug_554_test.py
+++ b/sources/shiboken6/tests/samplebinding/bug_554_test.py
diff --git a/sources/shiboken2/tests/samplebinding/bug_704_test.py b/sources/shiboken6/tests/samplebinding/bug_704_test.py
index d7cb0acd6..d7cb0acd6 100644
--- a/sources/shiboken2/tests/samplebinding/bug_704_test.py
+++ b/sources/shiboken6/tests/samplebinding/bug_704_test.py
diff --git a/sources/shiboken2/tests/samplebinding/bytearray_test.py b/sources/shiboken6/tests/samplebinding/bytearray_test.py
index af887493b..af887493b 100644
--- a/sources/shiboken2/tests/samplebinding/bytearray_test.py
+++ b/sources/shiboken6/tests/samplebinding/bytearray_test.py
diff --git a/sources/shiboken2/tests/samplebinding/child_return_test.py b/sources/shiboken6/tests/samplebinding/child_return_test.py
index 28fde4926..28fde4926 100644
--- a/sources/shiboken2/tests/samplebinding/child_return_test.py
+++ b/sources/shiboken6/tests/samplebinding/child_return_test.py
diff --git a/sources/shiboken2/tests/samplebinding/class_fields_test.py b/sources/shiboken6/tests/samplebinding/class_fields_test.py
index 202efcafb..202efcafb 100644
--- a/sources/shiboken2/tests/samplebinding/class_fields_test.py
+++ b/sources/shiboken6/tests/samplebinding/class_fields_test.py
diff --git a/sources/shiboken2/tests/samplebinding/collector_test.py b/sources/shiboken6/tests/samplebinding/collector_test.py
index d6d10165e..d6d10165e 100644
--- a/sources/shiboken2/tests/samplebinding/collector_test.py
+++ b/sources/shiboken6/tests/samplebinding/collector_test.py
diff --git a/sources/shiboken2/tests/samplebinding/complex_test.py b/sources/shiboken6/tests/samplebinding/complex_test.py
index bff7b5828..bff7b5828 100644
--- a/sources/shiboken2/tests/samplebinding/complex_test.py
+++ b/sources/shiboken6/tests/samplebinding/complex_test.py
diff --git a/sources/shiboken2/tests/samplebinding/conversion_operator_test.py b/sources/shiboken6/tests/samplebinding/conversion_operator_test.py
index a18d27a0c..a18d27a0c 100644
--- a/sources/shiboken2/tests/samplebinding/conversion_operator_test.py
+++ b/sources/shiboken6/tests/samplebinding/conversion_operator_test.py
diff --git a/sources/shiboken2/tests/samplebinding/copy_test.py b/sources/shiboken6/tests/samplebinding/copy_test.py
index a8e02d979..a8e02d979 100644
--- a/sources/shiboken2/tests/samplebinding/copy_test.py
+++ b/sources/shiboken6/tests/samplebinding/copy_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ctorconvrule_test.py b/sources/shiboken6/tests/samplebinding/ctorconvrule_test.py
index 7fd9b502c..7fd9b502c 100644
--- a/sources/shiboken2/tests/samplebinding/ctorconvrule_test.py
+++ b/sources/shiboken6/tests/samplebinding/ctorconvrule_test.py
diff --git a/sources/shiboken2/tests/samplebinding/cyclic_test.py b/sources/shiboken6/tests/samplebinding/cyclic_test.py
index 8fe029d59..8fe029d59 100644
--- a/sources/shiboken2/tests/samplebinding/cyclic_test.py
+++ b/sources/shiboken6/tests/samplebinding/cyclic_test.py
diff --git a/sources/shiboken2/tests/samplebinding/date_test.py b/sources/shiboken6/tests/samplebinding/date_test.py
index 0a89db871..0a89db871 100644
--- a/sources/shiboken2/tests/samplebinding/date_test.py
+++ b/sources/shiboken6/tests/samplebinding/date_test.py
diff --git a/sources/shiboken2/tests/samplebinding/decisor_test.py b/sources/shiboken6/tests/samplebinding/decisor_test.py
index e98e45bfc..e98e45bfc 100644
--- a/sources/shiboken2/tests/samplebinding/decisor_test.py
+++ b/sources/shiboken6/tests/samplebinding/decisor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/delete_test.py b/sources/shiboken6/tests/samplebinding/delete_test.py
index b35bba4b0..1da66f821 100644
--- a/sources/shiboken2/tests/samplebinding/delete_test.py
+++ b/sources/shiboken6/tests/samplebinding/delete_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from shiboken_paths import init_paths
 init_paths()
 import sample
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 class DeleteTest(unittest.TestCase):
     def testNonCppWrapperClassDelete(self):
diff --git a/sources/shiboken2/tests/samplebinding/deprecated_test.py b/sources/shiboken6/tests/samplebinding/deprecated_test.py
index d75490e17..d75490e17 100644
--- a/sources/shiboken2/tests/samplebinding/deprecated_test.py
+++ b/sources/shiboken6/tests/samplebinding/deprecated_test.py
diff --git a/sources/shiboken2/tests/samplebinding/derived_test.py b/sources/shiboken6/tests/samplebinding/derived_test.py
index 81f3a8034..81f3a8034 100644
--- a/sources/shiboken2/tests/samplebinding/derived_test.py
+++ b/sources/shiboken6/tests/samplebinding/derived_test.py
diff --git a/sources/shiboken2/tests/samplebinding/duck_punching_test.py b/sources/shiboken6/tests/samplebinding/duck_punching_test.py
index 11c55d00b..11c55d00b 100644
--- a/sources/shiboken2/tests/samplebinding/duck_punching_test.py
+++ b/sources/shiboken6/tests/samplebinding/duck_punching_test.py
diff --git a/sources/shiboken2/tests/samplebinding/echo_test.py b/sources/shiboken6/tests/samplebinding/echo_test.py
index cd3fcc090..cd3fcc090 100644
--- a/sources/shiboken2/tests/samplebinding/echo_test.py
+++ b/sources/shiboken6/tests/samplebinding/echo_test.py
diff --git a/sources/shiboken2/tests/samplebinding/enum_test.py b/sources/shiboken6/tests/samplebinding/enum_test.py
index 1289dada1..e425cb6ba 100644
--- a/sources/shiboken2/tests/samplebinding/enum_test.py
+++ b/sources/shiboken6/tests/samplebinding/enum_test.py
@@ -39,7 +39,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from shiboken_paths import init_paths
 init_paths()
 
-import shiboken2
+import shiboken6
 # This is needed after the introduction of BUILD_DIR.
 
 import sample
diff --git a/sources/shiboken2/tests/samplebinding/enumfromremovednamespace_test.py b/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py
index fc1da5d8a..fc1da5d8a 100644
--- a/sources/shiboken2/tests/samplebinding/enumfromremovednamespace_test.py
+++ b/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py
diff --git a/sources/shiboken2/tests/samplebinding/event_loop_call_virtual_test.py b/sources/shiboken6/tests/samplebinding/event_loop_call_virtual_test.py
index 41b91ed70..41b91ed70 100644
--- a/sources/shiboken2/tests/samplebinding/event_loop_call_virtual_test.py
+++ b/sources/shiboken6/tests/samplebinding/event_loop_call_virtual_test.py
diff --git a/sources/shiboken2/tests/samplebinding/event_loop_thread_test.py b/sources/shiboken6/tests/samplebinding/event_loop_thread_test.py
index 4c63d0665..4c63d0665 100644
--- a/sources/shiboken2/tests/samplebinding/event_loop_thread_test.py
+++ b/sources/shiboken6/tests/samplebinding/event_loop_thread_test.py
diff --git a/sources/shiboken2/tests/samplebinding/exception_test.py b/sources/shiboken6/tests/samplebinding/exception_test.py
index 3224dfe17..3224dfe17 100644
--- a/sources/shiboken2/tests/samplebinding/exception_test.py
+++ b/sources/shiboken6/tests/samplebinding/exception_test.py
diff --git a/sources/shiboken2/tests/samplebinding/filter_test.py b/sources/shiboken6/tests/samplebinding/filter_test.py
index b09d89980..b09d89980 100644
--- a/sources/shiboken2/tests/samplebinding/filter_test.py
+++ b/sources/shiboken6/tests/samplebinding/filter_test.py
diff --git a/sources/shiboken2/tests/samplebinding/global.h b/sources/shiboken6/tests/samplebinding/global.h
index 0a168099b..0a168099b 100644
--- a/sources/shiboken2/tests/samplebinding/global.h
+++ b/sources/shiboken6/tests/samplebinding/global.h
diff --git a/sources/shiboken2/tests/samplebinding/handleholder_test.py b/sources/shiboken6/tests/samplebinding/handleholder_test.py
index a4cbd1c72..a4cbd1c72 100644
--- a/sources/shiboken2/tests/samplebinding/handleholder_test.py
+++ b/sources/shiboken6/tests/samplebinding/handleholder_test.py
diff --git a/sources/shiboken2/tests/samplebinding/hashabletype_test.py b/sources/shiboken6/tests/samplebinding/hashabletype_test.py
index b985abaad..b985abaad 100644
--- a/sources/shiboken2/tests/samplebinding/hashabletype_test.py
+++ b/sources/shiboken6/tests/samplebinding/hashabletype_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ignorederefop_test.py b/sources/shiboken6/tests/samplebinding/ignorederefop_test.py
index 2237443b3..2237443b3 100644
--- a/sources/shiboken2/tests/samplebinding/ignorederefop_test.py
+++ b/sources/shiboken6/tests/samplebinding/ignorederefop_test.py
diff --git a/sources/shiboken2/tests/samplebinding/implicitconv_numerical_test.py b/sources/shiboken6/tests/samplebinding/implicitconv_numerical_test.py
index 94f2a5de7..94f2a5de7 100644
--- a/sources/shiboken2/tests/samplebinding/implicitconv_numerical_test.py
+++ b/sources/shiboken6/tests/samplebinding/implicitconv_numerical_test.py
diff --git a/sources/shiboken2/tests/samplebinding/implicitconv_test.py b/sources/shiboken6/tests/samplebinding/implicitconv_test.py
index a6b770c9b..a6b770c9b 100644
--- a/sources/shiboken2/tests/samplebinding/implicitconv_test.py
+++ b/sources/shiboken6/tests/samplebinding/implicitconv_test.py
diff --git a/sources/shiboken2/tests/samplebinding/inheritanceandscope_test.py b/sources/shiboken6/tests/samplebinding/inheritanceandscope_test.py
index 6b8a91573..6b8a91573 100644
--- a/sources/shiboken2/tests/samplebinding/inheritanceandscope_test.py
+++ b/sources/shiboken6/tests/samplebinding/inheritanceandscope_test.py
diff --git a/sources/shiboken2/tests/samplebinding/injectcode_test.py b/sources/shiboken6/tests/samplebinding/injectcode_test.py
index 8bdcdbe61..8bdcdbe61 100644
--- a/sources/shiboken2/tests/samplebinding/injectcode_test.py
+++ b/sources/shiboken6/tests/samplebinding/injectcode_test.py
diff --git a/sources/shiboken2/tests/samplebinding/innerclass_test.py b/sources/shiboken6/tests/samplebinding/innerclass_test.py
index 287726587..287726587 100644
--- a/sources/shiboken2/tests/samplebinding/innerclass_test.py
+++ b/sources/shiboken6/tests/samplebinding/innerclass_test.py
diff --git a/sources/shiboken2/tests/samplebinding/intlist_test.py b/sources/shiboken6/tests/samplebinding/intlist_test.py
index 19043b99c..19043b99c 100644
--- a/sources/shiboken2/tests/samplebinding/intlist_test.py
+++ b/sources/shiboken6/tests/samplebinding/intlist_test.py
diff --git a/sources/shiboken2/tests/samplebinding/invalid_virtual_return_test.py b/sources/shiboken6/tests/samplebinding/invalid_virtual_return_test.py
index 36e583a4f..36e583a4f 100644
--- a/sources/shiboken2/tests/samplebinding/invalid_virtual_return_test.py
+++ b/sources/shiboken6/tests/samplebinding/invalid_virtual_return_test.py
diff --git a/sources/shiboken2/tests/samplebinding/keep_reference_test.py b/sources/shiboken6/tests/samplebinding/keep_reference_test.py
index db3ddc2d4..db3ddc2d4 100644
--- a/sources/shiboken2/tests/samplebinding/keep_reference_test.py
+++ b/sources/shiboken6/tests/samplebinding/keep_reference_test.py
diff --git a/sources/shiboken2/tests/samplebinding/list_test.py b/sources/shiboken6/tests/samplebinding/list_test.py
index 74091422c..74091422c 100644
--- a/sources/shiboken2/tests/samplebinding/list_test.py
+++ b/sources/shiboken6/tests/samplebinding/list_test.py
diff --git a/sources/shiboken2/tests/samplebinding/lock_test.py b/sources/shiboken6/tests/samplebinding/lock_test.py
index 93c632e34..93c632e34 100644
--- a/sources/shiboken2/tests/samplebinding/lock_test.py
+++ b/sources/shiboken6/tests/samplebinding/lock_test.py
diff --git a/sources/shiboken2/tests/samplebinding/map_test.py b/sources/shiboken6/tests/samplebinding/map_test.py
index f6696c3d8..f6696c3d8 100644
--- a/sources/shiboken2/tests/samplebinding/map_test.py
+++ b/sources/shiboken6/tests/samplebinding/map_test.py
diff --git a/sources/shiboken2/tests/samplebinding/metaclass_test.py b/sources/shiboken6/tests/samplebinding/metaclass_test.py
index ad4c08f0d..ad4c08f0d 100644
--- a/sources/shiboken2/tests/samplebinding/metaclass_test.py
+++ b/sources/shiboken6/tests/samplebinding/metaclass_test.py
diff --git a/sources/shiboken2/tests/samplebinding/mi_virtual_methods_test.py b/sources/shiboken6/tests/samplebinding/mi_virtual_methods_test.py
index aea8a4d46..aea8a4d46 100644
--- a/sources/shiboken2/tests/samplebinding/mi_virtual_methods_test.py
+++ b/sources/shiboken6/tests/samplebinding/mi_virtual_methods_test.py
diff --git a/sources/shiboken2/tests/samplebinding/mixed_mi_test.py b/sources/shiboken6/tests/samplebinding/mixed_mi_test.py
index d33d033ba..d33d033ba 100644
--- a/sources/shiboken2/tests/samplebinding/mixed_mi_test.py
+++ b/sources/shiboken6/tests/samplebinding/mixed_mi_test.py
diff --git a/sources/shiboken2/tests/samplebinding/modelindex_test.py b/sources/shiboken6/tests/samplebinding/modelindex_test.py
index 905d14269..905d14269 100644
--- a/sources/shiboken2/tests/samplebinding/modelindex_test.py
+++ b/sources/shiboken6/tests/samplebinding/modelindex_test.py
diff --git a/sources/shiboken2/tests/samplebinding/modelview_test.py b/sources/shiboken6/tests/samplebinding/modelview_test.py
index f421ca41d..f421ca41d 100644
--- a/sources/shiboken2/tests/samplebinding/modelview_test.py
+++ b/sources/shiboken6/tests/samplebinding/modelview_test.py
diff --git a/sources/shiboken2/tests/samplebinding/modifications_test.py b/sources/shiboken6/tests/samplebinding/modifications_test.py
index 763ba04e5..763ba04e5 100644
--- a/sources/shiboken2/tests/samplebinding/modifications_test.py
+++ b/sources/shiboken6/tests/samplebinding/modifications_test.py
diff --git a/sources/shiboken2/tests/samplebinding/modified_constructor_test.py b/sources/shiboken6/tests/samplebinding/modified_constructor_test.py
index 11d931c5f..11d931c5f 100644
--- a/sources/shiboken2/tests/samplebinding/modified_constructor_test.py
+++ b/sources/shiboken6/tests/samplebinding/modified_constructor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/modifiedvirtualmethods_test.py b/sources/shiboken6/tests/samplebinding/modifiedvirtualmethods_test.py
index c15a0db08..c15a0db08 100644
--- a/sources/shiboken2/tests/samplebinding/modifiedvirtualmethods_test.py
+++ b/sources/shiboken6/tests/samplebinding/modifiedvirtualmethods_test.py
diff --git a/sources/shiboken2/tests/samplebinding/multi_cpp_inheritance_test.py b/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py
index c64a29e8e..c64a29e8e 100644
--- a/sources/shiboken2/tests/samplebinding/multi_cpp_inheritance_test.py
+++ b/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py
diff --git a/sources/shiboken2/tests/samplebinding/multiple_derived_test.py b/sources/shiboken6/tests/samplebinding/multiple_derived_test.py
index 650af8602..650af8602 100644
--- a/sources/shiboken2/tests/samplebinding/multiple_derived_test.py
+++ b/sources/shiboken6/tests/samplebinding/multiple_derived_test.py
diff --git a/sources/shiboken2/tests/samplebinding/namespace_test.py b/sources/shiboken6/tests/samplebinding/namespace_test.py
index 807e7bfc9..807e7bfc9 100644
--- a/sources/shiboken2/tests/samplebinding/namespace_test.py
+++ b/sources/shiboken6/tests/samplebinding/namespace_test.py
diff --git a/sources/shiboken2/tests/samplebinding/newdivision_test.py b/sources/shiboken6/tests/samplebinding/newdivision_test.py
index d352c1b91..d352c1b91 100644
--- a/sources/shiboken2/tests/samplebinding/newdivision_test.py
+++ b/sources/shiboken6/tests/samplebinding/newdivision_test.py
diff --git a/sources/shiboken2/tests/samplebinding/nondefaultctor_test.py b/sources/shiboken6/tests/samplebinding/nondefaultctor_test.py
index 68d083136..68d083136 100644
--- a/sources/shiboken2/tests/samplebinding/nondefaultctor_test.py
+++ b/sources/shiboken6/tests/samplebinding/nondefaultctor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/nontypetemplate_test.py b/sources/shiboken6/tests/samplebinding/nontypetemplate_test.py
index 7c4729b4f..7c4729b4f 100644
--- a/sources/shiboken2/tests/samplebinding/nontypetemplate_test.py
+++ b/sources/shiboken6/tests/samplebinding/nontypetemplate_test.py
diff --git a/sources/shiboken2/tests/samplebinding/nonzero_test.py b/sources/shiboken6/tests/samplebinding/nonzero_test.py
index 214b2f7bd..214b2f7bd 100644
--- a/sources/shiboken2/tests/samplebinding/nonzero_test.py
+++ b/sources/shiboken6/tests/samplebinding/nonzero_test.py
diff --git a/sources/shiboken2/tests/samplebinding/numericaltypedef_test.py b/sources/shiboken6/tests/samplebinding/numericaltypedef_test.py
index de9128cbc..de9128cbc 100644
--- a/sources/shiboken2/tests/samplebinding/numericaltypedef_test.py
+++ b/sources/shiboken6/tests/samplebinding/numericaltypedef_test.py
diff --git a/sources/shiboken2/tests/samplebinding/numpy_test.py b/sources/shiboken6/tests/samplebinding/numpy_test.py
index 3f67f59e4..3f67f59e4 100644
--- a/sources/shiboken2/tests/samplebinding/numpy_test.py
+++ b/sources/shiboken6/tests/samplebinding/numpy_test.py
diff --git a/sources/shiboken2/tests/samplebinding/objecttype_test.py b/sources/shiboken6/tests/samplebinding/objecttype_test.py
index 1d7f70722..277606e45 100644
--- a/sources/shiboken2/tests/samplebinding/objecttype_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttype_test.py
@@ -41,7 +41,7 @@ init_paths()
 import sys
 
 from sample import ObjectType, Str
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 
 class ObjectTypeTest(unittest.TestCase):
diff --git a/sources/shiboken2/tests/samplebinding/objecttype_with_named_args_test.py b/sources/shiboken6/tests/samplebinding/objecttype_with_named_args_test.py
index ce7874c23..ce7874c23 100644
--- a/sources/shiboken2/tests/samplebinding/objecttype_with_named_args_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttype_with_named_args_test.py
diff --git a/sources/shiboken2/tests/samplebinding/objecttypebyvalue_test.py b/sources/shiboken6/tests/samplebinding/objecttypebyvalue_test.py
index 080a51ce5..080a51ce5 100644
--- a/sources/shiboken2/tests/samplebinding/objecttypebyvalue_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttypebyvalue_test.py
diff --git a/sources/shiboken2/tests/samplebinding/objecttypelayout_test.py b/sources/shiboken6/tests/samplebinding/objecttypelayout_test.py
index bcf30eb43..bcf30eb43 100644
--- a/sources/shiboken2/tests/samplebinding/objecttypelayout_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttypelayout_test.py
diff --git a/sources/shiboken2/tests/samplebinding/objecttypeoperators_test.py b/sources/shiboken6/tests/samplebinding/objecttypeoperators_test.py
index fb0d52319..fb0d52319 100644
--- a/sources/shiboken2/tests/samplebinding/objecttypeoperators_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttypeoperators_test.py
diff --git a/sources/shiboken2/tests/samplebinding/objecttypereferenceasvirtualmethodargument_test.py b/sources/shiboken6/tests/samplebinding/objecttypereferenceasvirtualmethodargument_test.py
index 40adb94ed..40adb94ed 100644
--- a/sources/shiboken2/tests/samplebinding/objecttypereferenceasvirtualmethodargument_test.py
+++ b/sources/shiboken6/tests/samplebinding/objecttypereferenceasvirtualmethodargument_test.py
diff --git a/sources/shiboken2/tests/samplebinding/oddbool_test.py b/sources/shiboken6/tests/samplebinding/oddbool_test.py
index 5334e970c..5334e970c 100644
--- a/sources/shiboken2/tests/samplebinding/oddbool_test.py
+++ b/sources/shiboken6/tests/samplebinding/oddbool_test.py
diff --git a/sources/shiboken2/tests/samplebinding/onlycopyclass_test.py b/sources/shiboken6/tests/samplebinding/onlycopyclass_test.py
index ccf71f4f8..ccf71f4f8 100644
--- a/sources/shiboken2/tests/samplebinding/onlycopyclass_test.py
+++ b/sources/shiboken6/tests/samplebinding/onlycopyclass_test.py
diff --git a/sources/shiboken2/tests/samplebinding/overflow_test.py b/sources/shiboken6/tests/samplebinding/overflow_test.py
index 237bb6615..237bb6615 100644
--- a/sources/shiboken2/tests/samplebinding/overflow_test.py
+++ b/sources/shiboken6/tests/samplebinding/overflow_test.py
diff --git a/sources/shiboken2/tests/samplebinding/overload_sorting_test.py b/sources/shiboken6/tests/samplebinding/overload_sorting_test.py
index 958aa0a6d..958aa0a6d 100644
--- a/sources/shiboken2/tests/samplebinding/overload_sorting_test.py
+++ b/sources/shiboken6/tests/samplebinding/overload_sorting_test.py
diff --git a/sources/shiboken2/tests/samplebinding/overload_test.py b/sources/shiboken6/tests/samplebinding/overload_test.py
index ab5230990..ab5230990 100644
--- a/sources/shiboken2/tests/samplebinding/overload_test.py
+++ b/sources/shiboken6/tests/samplebinding/overload_test.py
diff --git a/sources/shiboken2/tests/samplebinding/overloadwithdefault_test.py b/sources/shiboken6/tests/samplebinding/overloadwithdefault_test.py
index 9444f9066..9444f9066 100644
--- a/sources/shiboken2/tests/samplebinding/overloadwithdefault_test.py
+++ b/sources/shiboken6/tests/samplebinding/overloadwithdefault_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_argument_invalidation_test.py b/sources/shiboken6/tests/samplebinding/ownership_argument_invalidation_test.py
index d96236c2c..d96236c2c 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_argument_invalidation_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_argument_invalidation_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_delete_child_in_cpp_test.py b/sources/shiboken6/tests/samplebinding/ownership_delete_child_in_cpp_test.py
index 255f1fdb1..255f1fdb1 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_delete_child_in_cpp_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_delete_child_in_cpp_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_delete_child_in_python_test.py b/sources/shiboken6/tests/samplebinding/ownership_delete_child_in_python_test.py
index f9504227c..f9504227c 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_delete_child_in_python_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_delete_child_in_python_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_delete_parent_test.py b/sources/shiboken6/tests/samplebinding/ownership_delete_parent_test.py
index 1b7de5f2f..1b7de5f2f 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_delete_parent_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_delete_parent_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_invalidate_after_use_test.py b/sources/shiboken6/tests/samplebinding/ownership_invalidate_after_use_test.py
index 10f1cf9ee..10f1cf9ee 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_invalidate_after_use_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_invalidate_after_use_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_invalidate_child_test.py b/sources/shiboken6/tests/samplebinding/ownership_invalidate_child_test.py
index 9e6423e50..9e6423e50 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_invalidate_child_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_invalidate_child_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py b/sources/shiboken6/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py
index 18fce3809..18fce3809 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_invalidate_parent_test.py b/sources/shiboken6/tests/samplebinding/ownership_invalidate_parent_test.py
index 2d7e67deb..2d7e67deb 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_invalidate_parent_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_invalidate_parent_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_reparenting_test.py b/sources/shiboken6/tests/samplebinding/ownership_reparenting_test.py
index 217566996..217566996 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_reparenting_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_reparenting_test.py
diff --git a/sources/shiboken2/tests/samplebinding/ownership_transference_test.py b/sources/shiboken6/tests/samplebinding/ownership_transference_test.py
index 1a783458e..1a783458e 100644
--- a/sources/shiboken2/tests/samplebinding/ownership_transference_test.py
+++ b/sources/shiboken6/tests/samplebinding/ownership_transference_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pair_test.py b/sources/shiboken6/tests/samplebinding/pair_test.py
index 65fd9b99c..65fd9b99c 100644
--- a/sources/shiboken2/tests/samplebinding/pair_test.py
+++ b/sources/shiboken6/tests/samplebinding/pair_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pen_test.py b/sources/shiboken6/tests/samplebinding/pen_test.py
index ff6ee5e0e..ff6ee5e0e 100644
--- a/sources/shiboken2/tests/samplebinding/pen_test.py
+++ b/sources/shiboken6/tests/samplebinding/pen_test.py
diff --git a/sources/shiboken2/tests/samplebinding/point_test.py b/sources/shiboken6/tests/samplebinding/point_test.py
index c2159e7d5..c2159e7d5 100644
--- a/sources/shiboken2/tests/samplebinding/point_test.py
+++ b/sources/shiboken6/tests/samplebinding/point_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pointerholder_test.py b/sources/shiboken6/tests/samplebinding/pointerholder_test.py
index b79eaa33a..b79eaa33a 100644
--- a/sources/shiboken2/tests/samplebinding/pointerholder_test.py
+++ b/sources/shiboken6/tests/samplebinding/pointerholder_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pointerprimitivetype_test.py b/sources/shiboken6/tests/samplebinding/pointerprimitivetype_test.py
index 648b35e41..1487f669a 100644
--- a/sources/shiboken2/tests/samplebinding/pointerprimitivetype_test.py
+++ b/sources/shiboken6/tests/samplebinding/pointerprimitivetype_test.py
@@ -53,7 +53,7 @@ from shiboken_paths import init_paths
 init_paths()
 from sample import IntArray2, VirtualMethods
 
-import shiboken2
+import shiboken6
 _init_pyside_extension()   # trigger init, which does not happen in tests
 from shibokensupport.signature import typing
 
diff --git a/sources/shiboken2/tests/samplebinding/pointf_test.py b/sources/shiboken6/tests/samplebinding/pointf_test.py
index e9630fe40..e9630fe40 100644
--- a/sources/shiboken2/tests/samplebinding/pointf_test.py
+++ b/sources/shiboken6/tests/samplebinding/pointf_test.py
diff --git a/sources/shiboken2/tests/samplebinding/primitivereferenceargument_test.py b/sources/shiboken6/tests/samplebinding/primitivereferenceargument_test.py
index 95c210b23..95c210b23 100644
--- a/sources/shiboken2/tests/samplebinding/primitivereferenceargument_test.py
+++ b/sources/shiboken6/tests/samplebinding/primitivereferenceargument_test.py
diff --git a/sources/shiboken2/tests/samplebinding/privatector_test.py b/sources/shiboken6/tests/samplebinding/privatector_test.py
index 7dc3d6651..7dc3d6651 100644
--- a/sources/shiboken2/tests/samplebinding/privatector_test.py
+++ b/sources/shiboken6/tests/samplebinding/privatector_test.py
diff --git a/sources/shiboken2/tests/samplebinding/privatedtor_test.py b/sources/shiboken6/tests/samplebinding/privatedtor_test.py
index 97d034729..532555686 100644
--- a/sources/shiboken2/tests/samplebinding/privatedtor_test.py
+++ b/sources/shiboken6/tests/samplebinding/privatedtor_test.py
@@ -40,7 +40,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from shiboken_paths import init_paths
 init_paths()
 
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 from sample import PrivateDtor
 
 
diff --git a/sources/shiboken2/tests/samplebinding/protected_test.py b/sources/shiboken6/tests/samplebinding/protected_test.py
index 0cfc69b12..0cfc69b12 100644
--- a/sources/shiboken2/tests/samplebinding/protected_test.py
+++ b/sources/shiboken6/tests/samplebinding/protected_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pstrlist_test.py b/sources/shiboken6/tests/samplebinding/pstrlist_test.py
index 04492de33..04492de33 100644
--- a/sources/shiboken2/tests/samplebinding/pstrlist_test.py
+++ b/sources/shiboken6/tests/samplebinding/pstrlist_test.py
diff --git a/sources/shiboken2/tests/samplebinding/pystr_test.py b/sources/shiboken6/tests/samplebinding/pystr_test.py
index b69cf369e..b69cf369e 100644
--- a/sources/shiboken2/tests/samplebinding/pystr_test.py
+++ b/sources/shiboken6/tests/samplebinding/pystr_test.py
diff --git a/sources/shiboken2/tests/samplebinding/python_thread_test.py b/sources/shiboken6/tests/samplebinding/python_thread_test.py
index 56b927367..56b927367 100644
--- a/sources/shiboken2/tests/samplebinding/python_thread_test.py
+++ b/sources/shiboken6/tests/samplebinding/python_thread_test.py
diff --git a/sources/shiboken2/tests/samplebinding/receive_null_cstring_test.py b/sources/shiboken6/tests/samplebinding/receive_null_cstring_test.py
index 8023aead0..8023aead0 100644
--- a/sources/shiboken2/tests/samplebinding/receive_null_cstring_test.py
+++ b/sources/shiboken6/tests/samplebinding/receive_null_cstring_test.py
diff --git a/sources/shiboken2/tests/samplebinding/reference_test.py b/sources/shiboken6/tests/samplebinding/reference_test.py
index 7ff806692..7ff806692 100644
--- a/sources/shiboken2/tests/samplebinding/reference_test.py
+++ b/sources/shiboken6/tests/samplebinding/reference_test.py
diff --git a/sources/shiboken2/tests/samplebinding/referencetopointer_test.py b/sources/shiboken6/tests/samplebinding/referencetopointer_test.py
index 240719e4b..240719e4b 100644
--- a/sources/shiboken2/tests/samplebinding/referencetopointer_test.py
+++ b/sources/shiboken6/tests/samplebinding/referencetopointer_test.py
diff --git a/sources/shiboken2/tests/samplebinding/renaming_test.py b/sources/shiboken6/tests/samplebinding/renaming_test.py
index 443fda6a3..443fda6a3 100644
--- a/sources/shiboken2/tests/samplebinding/renaming_test.py
+++ b/sources/shiboken6/tests/samplebinding/renaming_test.py
diff --git a/sources/shiboken2/tests/samplebinding/return_null_test.py b/sources/shiboken6/tests/samplebinding/return_null_test.py
index 85764679b..85764679b 100644
--- a/sources/shiboken2/tests/samplebinding/return_null_test.py
+++ b/sources/shiboken6/tests/samplebinding/return_null_test.py
diff --git a/sources/shiboken2/tests/samplebinding/richcompare_test.py b/sources/shiboken6/tests/samplebinding/richcompare_test.py
index bcda390c3..bcda390c3 100644
--- a/sources/shiboken2/tests/samplebinding/richcompare_test.py
+++ b/sources/shiboken6/tests/samplebinding/richcompare_test.py
diff --git a/sources/shiboken2/tests/samplebinding/sample-binding.txt.in b/sources/shiboken6/tests/samplebinding/sample-binding.txt.in
index 317f76f09..317f76f09 100644
--- a/sources/shiboken2/tests/samplebinding/sample-binding.txt.in
+++ b/sources/shiboken6/tests/samplebinding/sample-binding.txt.in
diff --git a/sources/shiboken2/tests/samplebinding/sample_test.py b/sources/shiboken6/tests/samplebinding/sample_test.py
index d6cf82f9a..d6cf82f9a 100644
--- a/sources/shiboken2/tests/samplebinding/sample_test.py
+++ b/sources/shiboken6/tests/samplebinding/sample_test.py
diff --git a/sources/shiboken2/tests/samplebinding/simplefile_glue.cpp b/sources/shiboken6/tests/samplebinding/simplefile_glue.cpp
index bccd51534..bccd51534 100644
--- a/sources/shiboken2/tests/samplebinding/simplefile_glue.cpp
+++ b/sources/shiboken6/tests/samplebinding/simplefile_glue.cpp
diff --git a/sources/shiboken2/tests/samplebinding/simplefile_test.py b/sources/shiboken6/tests/samplebinding/simplefile_test.py
index 4a841be80..4a841be80 100644
--- a/sources/shiboken2/tests/samplebinding/simplefile_test.py
+++ b/sources/shiboken6/tests/samplebinding/simplefile_test.py
diff --git a/sources/shiboken2/tests/samplebinding/size_test.py b/sources/shiboken6/tests/samplebinding/size_test.py
index 53626c961..53626c961 100644
--- a/sources/shiboken2/tests/samplebinding/size_test.py
+++ b/sources/shiboken6/tests/samplebinding/size_test.py
diff --git a/sources/shiboken2/tests/samplebinding/static_nonstatic_methods_test.py b/sources/shiboken6/tests/samplebinding/static_nonstatic_methods_test.py
index cd1a8a4f0..cd1a8a4f0 100644
--- a/sources/shiboken2/tests/samplebinding/static_nonstatic_methods_test.py
+++ b/sources/shiboken6/tests/samplebinding/static_nonstatic_methods_test.py
diff --git a/sources/shiboken2/tests/samplebinding/str_test.py b/sources/shiboken6/tests/samplebinding/str_test.py
index 15df1f55a..15df1f55a 100644
--- a/sources/shiboken2/tests/samplebinding/str_test.py
+++ b/sources/shiboken6/tests/samplebinding/str_test.py
diff --git a/sources/shiboken2/tests/samplebinding/strlist_test.py b/sources/shiboken6/tests/samplebinding/strlist_test.py
index 57537f061..57537f061 100644
--- a/sources/shiboken2/tests/samplebinding/strlist_test.py
+++ b/sources/shiboken6/tests/samplebinding/strlist_test.py
diff --git a/sources/shiboken2/tests/samplebinding/templateinheritingclass_test.py b/sources/shiboken6/tests/samplebinding/templateinheritingclass_test.py
index bc66b208f..bc66b208f 100644
--- a/sources/shiboken2/tests/samplebinding/templateinheritingclass_test.py
+++ b/sources/shiboken6/tests/samplebinding/templateinheritingclass_test.py
diff --git a/sources/shiboken2/tests/samplebinding/time_test.py b/sources/shiboken6/tests/samplebinding/time_test.py
index f8b35e7b7..f8b35e7b7 100644
--- a/sources/shiboken2/tests/samplebinding/time_test.py
+++ b/sources/shiboken6/tests/samplebinding/time_test.py
diff --git a/sources/shiboken2/tests/samplebinding/transform_test.py b/sources/shiboken6/tests/samplebinding/transform_test.py
index 5369ec466..5369ec466 100644
--- a/sources/shiboken2/tests/samplebinding/transform_test.py
+++ b/sources/shiboken6/tests/samplebinding/transform_test.py
diff --git a/sources/shiboken2/tests/samplebinding/typeconverters_test.py b/sources/shiboken6/tests/samplebinding/typeconverters_test.py
index 33f3b62e5..33f3b62e5 100644
--- a/sources/shiboken2/tests/samplebinding/typeconverters_test.py
+++ b/sources/shiboken6/tests/samplebinding/typeconverters_test.py
diff --git a/sources/shiboken2/tests/samplebinding/typedealloc_test.py b/sources/shiboken6/tests/samplebinding/typedealloc_test.py
index b79b6de0e..b79b6de0e 100644
--- a/sources/shiboken2/tests/samplebinding/typedealloc_test.py
+++ b/sources/shiboken6/tests/samplebinding/typedealloc_test.py
diff --git a/sources/shiboken2/tests/samplebinding/typedtordoublefree_test.py b/sources/shiboken6/tests/samplebinding/typedtordoublefree_test.py
index 8cf93866f..8cf93866f 100644
--- a/sources/shiboken2/tests/samplebinding/typedtordoublefree_test.py
+++ b/sources/shiboken6/tests/samplebinding/typedtordoublefree_test.py
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml
index b310f8d62..b310f8d62 100644
--- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
+++ b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml
diff --git a/sources/shiboken2/tests/samplebinding/typesystypedef_test.py b/sources/shiboken6/tests/samplebinding/typesystypedef_test.py
index 30ac1c900..30ac1c900 100644
--- a/sources/shiboken2/tests/samplebinding/typesystypedef_test.py
+++ b/sources/shiboken6/tests/samplebinding/typesystypedef_test.py
diff --git a/sources/shiboken2/tests/samplebinding/unsafe_parent_test.py b/sources/shiboken6/tests/samplebinding/unsafe_parent_test.py
index 1387e308c..1387e308c 100644
--- a/sources/shiboken2/tests/samplebinding/unsafe_parent_test.py
+++ b/sources/shiboken6/tests/samplebinding/unsafe_parent_test.py
diff --git a/sources/shiboken2/tests/samplebinding/useraddedctor_test.py b/sources/shiboken6/tests/samplebinding/useraddedctor_test.py
index f59fb3533..f59fb3533 100644
--- a/sources/shiboken2/tests/samplebinding/useraddedctor_test.py
+++ b/sources/shiboken6/tests/samplebinding/useraddedctor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/virtualdtor_test.py b/sources/shiboken6/tests/samplebinding/virtualdtor_test.py
index 365d31f59..365d31f59 100644
--- a/sources/shiboken2/tests/samplebinding/virtualdtor_test.py
+++ b/sources/shiboken6/tests/samplebinding/virtualdtor_test.py
diff --git a/sources/shiboken2/tests/samplebinding/virtualmethods_test.py b/sources/shiboken6/tests/samplebinding/virtualmethods_test.py
index 07b79c489..07b79c489 100644
--- a/sources/shiboken2/tests/samplebinding/virtualmethods_test.py
+++ b/sources/shiboken6/tests/samplebinding/virtualmethods_test.py
diff --git a/sources/shiboken2/tests/samplebinding/visibilitychange_test.py b/sources/shiboken6/tests/samplebinding/visibilitychange_test.py
index 7f723221a..7f723221a 100644
--- a/sources/shiboken2/tests/samplebinding/visibilitychange_test.py
+++ b/sources/shiboken6/tests/samplebinding/visibilitychange_test.py
diff --git a/sources/shiboken2/tests/samplebinding/voidholder_test.py b/sources/shiboken6/tests/samplebinding/voidholder_test.py
index 07b83347b..4099d39a4 100644
--- a/sources/shiboken2/tests/samplebinding/voidholder_test.py
+++ b/sources/shiboken6/tests/samplebinding/voidholder_test.py
@@ -40,7 +40,7 @@ from shiboken_paths import init_paths
 init_paths()
 
 from sample import VoidHolder, Point
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 class VoidHolderTest(unittest.TestCase):
     '''Test case for void pointer manipulation.'''
diff --git a/sources/shiboken2/tests/samplebinding/weakref_test.py b/sources/shiboken6/tests/samplebinding/weakref_test.py
index a4a2dc461..a4a2dc461 100644
--- a/sources/shiboken2/tests/samplebinding/weakref_test.py
+++ b/sources/shiboken6/tests/samplebinding/weakref_test.py
diff --git a/sources/shiboken2/tests/samplebinding/writableclassdict_test.py b/sources/shiboken6/tests/samplebinding/writableclassdict_test.py
index 58083b5d4..58083b5d4 100644
--- a/sources/shiboken2/tests/samplebinding/writableclassdict_test.py
+++ b/sources/shiboken6/tests/samplebinding/writableclassdict_test.py
diff --git a/sources/shiboken2/tests/shiboken_paths.py b/sources/shiboken6/tests/shiboken_paths.py
index 1072aa501..382079c36 100644
--- a/sources/shiboken2/tests/shiboken_paths.py
+++ b/sources/shiboken6/tests/shiboken_paths.py
@@ -101,14 +101,14 @@ def add_lib_dirs(lib_dirs):
 
 def shiboken_paths(include_shiboken_tests=False):
     """Return a tuple of python directories/lib directories to be set for
-       using the shiboken2 module from the build directory or running the
+       using the shiboken6 module from the build directory or running the
        shiboken tests depending on a single environment variable BUILD_DIR
        pointing to the build directory."""
     src_dir = os.path.dirname(os.path.abspath(__file__))
     python_dirs = []
     if include_shiboken_tests:
         python_dirs.append(src_dir)  # For shiboken_test_helper
-    shiboken_dir = os.path.join(get_build_dir(), 'shiboken2')
+    shiboken_dir = os.path.join(get_build_dir(), 'shiboken6')
     python_dirs.append(os.path.join(shiboken_dir, 'shibokenmodule'))
     lib_dirs = [os.path.join(shiboken_dir, 'libshiboken')]
     if include_shiboken_tests:
diff --git a/sources/shiboken2/tests/shiboken_test_helper.py b/sources/shiboken6/tests/shiboken_test_helper.py
index 793baf4ad..793baf4ad 100644
--- a/sources/shiboken2/tests/shiboken_test_helper.py
+++ b/sources/shiboken6/tests/shiboken_test_helper.py
diff --git a/sources/shiboken2/tests/shibokenmodule/module_test.py b/sources/shiboken6/tests/shibokenmodule/module_test.py
index d0a8e6bf5..0bbfb282a 100644
--- a/sources/shiboken2/tests/shibokenmodule/module_test.py
+++ b/sources/shiboken6/tests/shibokenmodule/module_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from shiboken_paths import init_paths
 init_paths()
 
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 from sample import *
 
 class MultipleInherited (ObjectType, Point):
diff --git a/sources/shiboken2/tests/smartbinding/CMakeLists.txt b/sources/shiboken6/tests/smartbinding/CMakeLists.txt
index 88a7bc059..637420651 100644
--- a/sources/shiboken2/tests/smartbinding/CMakeLists.txt
+++ b/sources/shiboken6/tests/smartbinding/CMakeLists.txt
@@ -21,8 +21,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/smart-binding.txt.in"
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
 BYPRODUCTS ${smart_SRC}
-COMMAND shiboken2 --project-file=${CMAKE_CURRENT_BINARY_DIR}/smart-binding.txt ${GENERATOR_EXTRA_FLAGS}
-DEPENDS ${smart_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken2
+COMMAND shiboken6 --project-file=${CMAKE_CURRENT_BINARY_DIR}/smart-binding.txt ${GENERATOR_EXTRA_FLAGS}
+DEPENDS ${smart_TYPESYSTEM} ${CMAKE_CURRENT_SOURCE_DIR}/global.h shiboken6
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'smart' test binding..."
 )
diff --git a/sources/shiboken2/tests/smartbinding/global.h b/sources/shiboken6/tests/smartbinding/global.h
index 959859b40..959859b40 100644
--- a/sources/shiboken2/tests/smartbinding/global.h
+++ b/sources/shiboken6/tests/smartbinding/global.h
diff --git a/sources/shiboken2/tests/smartbinding/smart-binding.txt.in b/sources/shiboken6/tests/smartbinding/smart-binding.txt.in
index 699f0bfe6..699f0bfe6 100644
--- a/sources/shiboken2/tests/smartbinding/smart-binding.txt.in
+++ b/sources/shiboken6/tests/smartbinding/smart-binding.txt.in
diff --git a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py b/sources/shiboken6/tests/smartbinding/smart_pointer_test.py
index d7ddf963c..d7ddf963c 100644
--- a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
+++ b/sources/shiboken6/tests/smartbinding/smart_pointer_test.py
diff --git a/sources/shiboken2/tests/smartbinding/typesystem_smart.xml b/sources/shiboken6/tests/smartbinding/typesystem_smart.xml
index 46cb08267..46cb08267 100644
--- a/sources/shiboken2/tests/smartbinding/typesystem_smart.xml
+++ b/sources/shiboken6/tests/smartbinding/typesystem_smart.xml
diff --git a/sources/shiboken2/tests/sphinxtabletest.cpp b/sources/shiboken6/tests/sphinxtabletest.cpp
index 5ad56fb69..5ad56fb69 100644
--- a/sources/shiboken2/tests/sphinxtabletest.cpp
+++ b/sources/shiboken6/tests/sphinxtabletest.cpp
diff --git a/sources/shiboken2/tests/sphinxtabletest.h b/sources/shiboken6/tests/sphinxtabletest.h
index bba020207..bba020207 100644
--- a/sources/shiboken2/tests/sphinxtabletest.h
+++ b/sources/shiboken6/tests/sphinxtabletest.h
diff --git a/sources/shiboken2/tests/test_generator/CMakeLists.txt b/sources/shiboken6/tests/test_generator/CMakeLists.txt
index b48ae37da..b48ae37da 100644
--- a/sources/shiboken2/tests/test_generator/CMakeLists.txt
+++ b/sources/shiboken6/tests/test_generator/CMakeLists.txt
diff --git a/sources/shiboken2/tests/test_generator/dummygenerator.cpp b/sources/shiboken6/tests/test_generator/dummygenerator.cpp
index ef82c11c9..ef82c11c9 100644
--- a/sources/shiboken2/tests/test_generator/dummygenerator.cpp
+++ b/sources/shiboken6/tests/test_generator/dummygenerator.cpp
diff --git a/sources/shiboken2/tests/test_generator/dummygenerator.h b/sources/shiboken6/tests/test_generator/dummygenerator.h
index e768e7643..e768e7643 100644
--- a/sources/shiboken2/tests/test_generator/dummygenerator.h
+++ b/sources/shiboken6/tests/test_generator/dummygenerator.h
diff --git a/sources/shiboken2/tests/test_generator/dummygentest-project.txt.in b/sources/shiboken6/tests/test_generator/dummygentest-project.txt.in
index 0a076d8bd..0a076d8bd 100644
--- a/sources/shiboken2/tests/test_generator/dummygentest-project.txt.in
+++ b/sources/shiboken6/tests/test_generator/dummygentest-project.txt.in
diff --git a/sources/shiboken2/tests/test_generator/dummygentest.cpp b/sources/shiboken6/tests/test_generator/dummygentest.cpp
index c09cdfb82..c09cdfb82 100644
--- a/sources/shiboken2/tests/test_generator/dummygentest.cpp
+++ b/sources/shiboken6/tests/test_generator/dummygentest.cpp
diff --git a/sources/shiboken2/tests/test_generator/dummygentest.h b/sources/shiboken6/tests/test_generator/dummygentest.h
index 78bae1d52..78bae1d52 100644
--- a/sources/shiboken2/tests/test_generator/dummygentest.h
+++ b/sources/shiboken6/tests/test_generator/dummygentest.h
diff --git a/sources/shiboken2/tests/test_generator/dummygentestconfig.h.in b/sources/shiboken6/tests/test_generator/dummygentestconfig.h.in
index 9da17dcd3..9da17dcd3 100644
--- a/sources/shiboken2/tests/test_generator/dummygentestconfig.h.in
+++ b/sources/shiboken6/tests/test_generator/dummygentestconfig.h.in
diff --git a/sources/shiboken2/tests/test_generator/main.cpp b/sources/shiboken6/tests/test_generator/main.cpp
index f928b4d2c..f928b4d2c 100644
--- a/sources/shiboken2/tests/test_generator/main.cpp
+++ b/sources/shiboken6/tests/test_generator/main.cpp
diff --git a/sources/shiboken2/tests/test_generator/run_test.cmake b/sources/shiboken6/tests/test_generator/run_test.cmake
index 34a821d80..34a821d80 100644
--- a/sources/shiboken2/tests/test_generator/run_test.cmake
+++ b/sources/shiboken6/tests/test_generator/run_test.cmake
diff --git a/sources/shiboken2/tests/test_generator/test_global.h b/sources/shiboken6/tests/test_generator/test_global.h
index 6a95200cf..6a95200cf 100644
--- a/sources/shiboken2/tests/test_generator/test_global.h
+++ b/sources/shiboken6/tests/test_generator/test_global.h
diff --git a/sources/shiboken2/tests/test_generator/test_typesystem.xml b/sources/shiboken6/tests/test_generator/test_typesystem.xml
index c19a4e95e..c19a4e95e 100644
--- a/sources/shiboken2/tests/test_generator/test_typesystem.xml
+++ b/sources/shiboken6/tests/test_generator/test_typesystem.xml
diff --git a/testing/command.py b/testing/command.py
index 886ab3e74..819fee8ce 100644
--- a/testing/command.py
+++ b/testing/command.py
@@ -160,8 +160,8 @@ def test_project(project, args, blacklist, runs):
 def main():
     # create the top-level command parser
     start_time = timer()
-    all_projects = "shiboken2 pyside2 pyside2-tools".split()
-    tested_projects = "shiboken2 pyside2".split()
+    all_projects = "shiboken6 pyside2 pyside2-tools".split()
+    tested_projects = "shiboken6 pyside2".split()
     parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description=dedent("""\
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py
index 100fd18f7..9f4c3ab6c 100644
--- a/testing/wheel_tester.py
+++ b/testing/wheel_tester.py
@@ -111,9 +111,9 @@ def get_examples_dir():
 
 
 def package_prefix_names():
-    # Note: shiboken2_generator is not needed for compile_using_pyinstaller,
+    # Note: shiboken6_generator is not needed for compile_using_pyinstaller,
     # but building modules with cmake needs it.
-    return ["shiboken2", "shiboken2_generator", "PySide2"]
+    return ["shiboken6", "shiboken6_generator", "PySide2"]
 
 
 def clean_egg_info():
diff --git a/tools/create_changelog.py b/tools/create_changelog.py
index 8f5ea7ad0..30679ecf3 100644
--- a/tools/create_changelog.py
+++ b/tools/create_changelog.py
@@ -175,8 +175,8 @@ def git_command(versions: List[str], pattern: str):
             task_number = int(task_number_match.group(1))
         entry = {"title": title, "task": task, "task-number": task_number}
         if "shiboken" in title:
-            if sha not in shiboken2_commits:
-                shiboken2_commits[sha] = entry
+            if sha not in shiboken6_commits:
+                shiboken6_commits[sha] = entry
         else:
             if sha not in pyside2_commits:
                 pyside2_commits[sha] = entry
@@ -192,7 +192,7 @@ def create_task_log(versions: List[str]) -> None:
 
 def extract_change_log(commit_message: List[str]) -> Tuple[str, List[str]]:
     """Extract a tuple of (component, change log lines) from a commit message
-       of the form [ChangeLog][shiboken2] description..."""
+       of the form [ChangeLog][shiboken6] description..."""
     result = []
     component = 'pyside'
     within_changelog = False
@@ -219,7 +219,7 @@ def create_change_log(versions: List[str]) -> None:
     for sha in git_get_sha1s(versions, r"\[ChangeLog\]"):
         change_log = extract_change_log(get_commit_content(sha).splitlines())
         if change_log[0].startswith('shiboken'):
-            shiboken2_changelogs.extend(change_log[1])
+            shiboken6_changelogs.extend(change_log[1])
         else:
             pyside2_changelogs.extend(change_log[1])
 
@@ -239,9 +239,9 @@ if __name__ == "__main__":
 
     args = parse_options()
     pyside2_commits: Dict[str, Dict[str, str]] = {}
-    shiboken2_commits: Dict[str, Dict[str, str]] = {}
+    shiboken6_commits: Dict[str, Dict[str, str]] = {}
     pyside2_changelogs: List[str] = []
-    shiboken2_changelogs: List[str] = []
+    shiboken6_changelogs: List[str] = []
 
     # Getting commits information
     directory = args.directory if args.directory else "."
@@ -254,7 +254,7 @@ if __name__ == "__main__":
 
     # Sort commits
     pyside2_commits = sort_dict(pyside2_commits)
-    shiboken2_commits = sort_dict(shiboken2_commits)
+    shiboken6_commits = sort_dict(shiboken6_commits)
 
     # Generate message
     print(content_header.replace("@VERSION", args.release).
@@ -264,7 +264,7 @@ if __name__ == "__main__":
     if not pyside2_changelogs and not pyside2_commits:
         print(" - No changes")
     print(shiboken_header)
-    print('\n'.join(shiboken2_changelogs))
-    print(gen_list(shiboken2_commits))
-    if not shiboken2_changelogs and not shiboken2_commits:
+    print('\n'.join(shiboken6_changelogs))
+    print(gen_list(shiboken6_commits))
+    if not shiboken6_changelogs and not shiboken6_commits:
         print(" - No changes")