diff --git a/DDCore/python/dd4hepFactories.py b/DDCore/python/dd4hepFactories.py
index cba990e63132435b337e25b70d9afab91314c71e..2a1a4650c421d4907b7d8023a5fbdab12d9ae89c 100755
--- a/DDCore/python/dd4hepFactories.py
+++ b/DDCore/python/dd4hepFactories.py
@@ -15,7 +15,7 @@ import os
 import sys
 import optparse
 import logging
-from six.moves import input
+from ddsix.moves import input
 from io import open
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py
index 915c6db4557374b67a0b2f5bbcebb0ba3c29600b..921a5cfe73bec15e5e3967658379aec30bcd247d 100644
--- a/DDCore/python/lcdd.py
+++ b/DDCore/python/lcdd.py
@@ -17,7 +17,7 @@ from functools import partial
 import SystemOfUnits
 import math
 import logging
-from six.moves import range
+from ddsix.moves import range
 from io import open
 from ROOT import SetOwnership, dd4hep, TGeoMixture, TGeoMedium, gGeoManager, TNamed
 
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 3a24c81eceb0538a9f2ce162025228f4d251082d..783addf6becdf66b3a4363b58c761fcb55d8e50b 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -13,7 +13,7 @@ import g4units as G4Units
 from dd4hep_base import std, std_vector, std_list, std_map, std_pair
 import logging
 from dd4hep_base import *
-import six
+import ddsix as six
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)
diff --git a/DDG4/python/DDSim/DD4hepSimulation.py b/DDG4/python/DDSim/DD4hepSimulation.py
index b3b577a59e473be4a19bdc104999846457183e40..f39ed08f8a803c25e92b56161149b5100ea35f54 100644
--- a/DDG4/python/DDSim/DD4hepSimulation.py
+++ b/DDG4/python/DDSim/DD4hepSimulation.py
@@ -23,7 +23,7 @@ from DDSim.Helper.MagneticField import MagneticField
 from DDSim.Helper.ParticleHandler import ParticleHandler
 from DDSim.Helper.Gun import Gun
 import argparse
-import six
+import ddsix as six
 from g4units import *
 import logging
 from io import open
diff --git a/DDG4/python/DDSim/Helper/Action.py b/DDG4/python/DDSim/Helper/Action.py
index 5418770cc5fe2dee37da40adf570dd33a46402be..afa52ad3d303836b54a7fc33740d036a806a8a8e 100644
--- a/DDG4/python/DDSim/Helper/Action.py
+++ b/DDG4/python/DDSim/Helper/Action.py
@@ -3,8 +3,8 @@
 
 from __future__ import absolute_import, unicode_literals
 from DDSim.Helper.ConfigHelper import ConfigHelper
-from six.moves import range
-import six
+from ddsix.moves import range
+import ddsix as six
 
 
 class Action(ConfigHelper):
diff --git a/DDG4/python/DDSim/Helper/ConfigHelper.py b/DDG4/python/DDSim/Helper/ConfigHelper.py
index 253fba6c0292288ede499716ac4277ad63442b38..179a84f46983e1dd1f24dccdd926e9769f030882 100644
--- a/DDG4/python/DDSim/Helper/ConfigHelper.py
+++ b/DDG4/python/DDSim/Helper/ConfigHelper.py
@@ -14,7 +14,7 @@ call for the parser object create an additional member::
 
 from __future__ import absolute_import, unicode_literals
 from pprint import pprint
-import six
+import ddsix as six
 
 
 class ConfigHelper(object):
diff --git a/DDG4/python/DDSim/Helper/Filter.py b/DDG4/python/DDSim/Helper/Filter.py
index 0c027f620351c6e191e68949d46a1dee2579be5e..2bedf7fb2897c5b875e8ae039c273f8637558c80 100644
--- a/DDG4/python/DDSim/Helper/Filter.py
+++ b/DDG4/python/DDSim/Helper/Filter.py
@@ -9,8 +9,8 @@ from __future__ import absolute_import, unicode_literals
 from DDSim.Helper.ConfigHelper import ConfigHelper
 from g4units import keV
 import logging
-from six.moves import range
-import six
+from ddsix.moves import range
+import ddsix as six
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)
diff --git a/DDG4/python/DDSim/Helper/Gun.py b/DDG4/python/DDSim/Helper/Gun.py
index ff3baf5b1571f6c53704c32da02c33627f5cabae..fe71b1edfb2f7d886f960a559cb3de077d736996 100644
--- a/DDG4/python/DDSim/Helper/Gun.py
+++ b/DDG4/python/DDSim/Helper/Gun.py
@@ -4,7 +4,7 @@ from __future__ import absolute_import, unicode_literals
 from DDSim.Helper.ConfigHelper import ConfigHelper
 from g4units import GeV
 import logging
-import six
+import ddsix as six
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)
diff --git a/DDG4/python/DDSim/Helper/Input.py b/DDG4/python/DDSim/Helper/Input.py
index 89294546df7e0a8f067c845064dc78f49ace50b9..5b4e23885afb634307bea2d1b3c6698e4295e7a9 100644
--- a/DDG4/python/DDSim/Helper/Input.py
+++ b/DDG4/python/DDSim/Helper/Input.py
@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import, unicode_literals
 from DDSim.Helper.ConfigHelper import ConfigHelper
-import six
+import ddsix as six
 
 
 class Input(ConfigHelper):
diff --git a/DDG4/python/DDSim/Helper/Meta.py b/DDG4/python/DDSim/Helper/Meta.py
index f1091b1eb127acb9721570beafae86e48245c9bb..2599d6c3344b4d683a4b82d6ce2f45bda9448893 100644
--- a/DDG4/python/DDSim/Helper/Meta.py
+++ b/DDG4/python/DDSim/Helper/Meta.py
@@ -5,7 +5,7 @@ from DDSim.Helper.ConfigHelper import ConfigHelper
 import datetime
 import os
 import logging
-import six
+import ddsix as six
 from io import open
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
diff --git a/DDG4/python/DDSim/Helper/Physics.py b/DDG4/python/DDSim/Helper/Physics.py
index a7eb4589daed94d1e8ff093a02fffe6f31885a59..740ffc90a713c71cb49cb76040eda6633fa56f58 100644
--- a/DDG4/python/DDSim/Helper/Physics.py
+++ b/DDG4/python/DDSim/Helper/Physics.py
@@ -5,7 +5,7 @@ import os
 
 from DDSim.Helper.ConfigHelper import ConfigHelper
 from g4units import mm
-import six
+import ddsix as six
 
 
 class Physics(ConfigHelper):
diff --git a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py
index 923646f843129014247ba7b6de25504718d7ff47..97716ce436a5e045809e4451d16d94ed1e1a5d0b 100644
--- a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py
+++ b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py
@@ -1,6 +1,6 @@
 # cpluginsvc is a ctypes-based wrapper for the C-exposed API of GaudiPluginService
 from __future__ import absolute_import, unicode_literals, print_function
-from six.moves import range
+from ddsix.moves import range
 __doc__ = '''
 cpluginsvc is a ctypes-based wrapper for the C-API of the GaudiPluginService.
 
diff --git a/examples/AlignDet/drivers/Shelf.py b/examples/AlignDet/drivers/Shelf.py
index e6a1cdc98407299179f02efd756fd1678e26f71b..50955d7a4d60d64b36cc7c085f14e1bb94c37a76 100644
--- a/examples/AlignDet/drivers/Shelf.py
+++ b/examples/AlignDet/drivers/Shelf.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, unicode_literals
-from six.moves import range
+from ddsix.moves import range
 
 
 def detector_Shelf(description, det):
diff --git a/examples/CLICSiD/scripts/CLICRandom.py b/examples/CLICSiD/scripts/CLICRandom.py
index 95a69865eb4a0237e67ba48a49f4a7b14850d00c..7e69b3d59af0e578ee79f6ec5e01a02572f9af21 100644
--- a/examples/CLICSiD/scripts/CLICRandom.py
+++ b/examples/CLICSiD/scripts/CLICRandom.py
@@ -10,7 +10,7 @@ from ROOT import TRandom
 from ROOT import gRandom
 
 import logging
-from six.moves import range
+from ddsix.moves import range
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)
diff --git a/examples/ClientTests/scripts/MultiCollections.py b/examples/ClientTests/scripts/MultiCollections.py
index 8134391112a419cf132a940fd7729f77bd2e80a5..32d5298cf926c9575a54ce2ffd64b146993efa7d 100644
--- a/examples/ClientTests/scripts/MultiCollections.py
+++ b/examples/ClientTests/scripts/MultiCollections.py
@@ -5,7 +5,7 @@ import time
 import DDG4
 from DDG4 import OutputLevel as Output
 from SystemOfUnits import *
-from six.moves import range
+from ddsix.moves import range
 #
 #
 """
diff --git a/examples/ClientTests/scripts/MultiSegmentCollections.py b/examples/ClientTests/scripts/MultiSegmentCollections.py
index 7af8380d4e3496e4322af6a64a21dafbd3bbd824..68edb8d20ed3f72f8274007408b8773258d20f97 100644
--- a/examples/ClientTests/scripts/MultiSegmentCollections.py
+++ b/examples/ClientTests/scripts/MultiSegmentCollections.py
@@ -5,7 +5,7 @@ import time
 import DDG4
 from DDG4 import OutputLevel as Output
 from SystemOfUnits import *
-from six.moves import range
+from ddsix.moves import range
 #
 #
 """
diff --git a/examples/DDCMS/scripts/CMSTrackerSim.py b/examples/DDCMS/scripts/CMSTrackerSim.py
index 1d09395be6aa42330b18738c819c3621fa1406ab..9278fdd1f0579a9255a783d5d812e71fab1436ee 100644
--- a/examples/DDCMS/scripts/CMSTrackerSim.py
+++ b/examples/DDCMS/scripts/CMSTrackerSim.py
@@ -6,7 +6,7 @@ import DDG4
 from DDG4 import OutputLevel as Output
 from SystemOfUnits import *
 import logging
-from six.moves import range
+from ddsix.moves import range
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)
diff --git a/examples/LHeD/scripts/LHeDRandom.py b/examples/LHeD/scripts/LHeDRandom.py
index 1b949397cee087cf4a1ff3af381c1be0a3a941d2..ca916c010033ff699b2cc3f999d41eb7ce16b7e2 100644
--- a/examples/LHeD/scripts/LHeDRandom.py
+++ b/examples/LHeD/scripts/LHeDRandom.py
@@ -9,7 +9,7 @@ from __future__ import absolute_import, unicode_literals
 from ROOT import TRandom
 from ROOT import gRandom
 import logging
-from six.moves import range
+from ddsix.moves import range
 
 logging.basicConfig(format='%(levelname)s: %(message)s')
 logger = logging.getLogger(__name__)