diff --git a/boost/optional.py b/boost/optional.py
index 4605649473..069926bee6 100644
--- a/boost/optional.py
+++ b/boost/optional.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
-from boost_adaptbx.optional import *
+from boost_adaptbx.boost.optional import *
 import warnings
 
 warnings.warn(
   "importing from boost.optional is deprecated; this module will be removed shortly. "
-  "import from boost_adaptbx.optional instead. "
+  "import from boost_adaptbx.boost.optional instead. "
   "Please see https://github.com/cctbx/cctbx_project/issues/458 for more information.",
   FutureWarning,
   stacklevel=2
diff --git a/boost/python.py b/boost/python.py
index 94422173a4..ea28db0732 100644
--- a/boost/python.py
+++ b/boost/python.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
-from boost_adaptbx.python import *
+from boost_adaptbx.boost.python import *
 import warnings
 
 warnings.warn(
   "importing from boost.python is deprecated; this module will be removed shortly. "
-  "import from boost_adaptbx.python instead. "
+  "import from boost_adaptbx.boost.python instead. "
   "Please see https://github.com/cctbx/cctbx_project/issues/458 for more information.",
   FutureWarning,
   stacklevel=2
@@ -18,7 +18,7 @@ class CrystalExt(boost.python.injector, Crystal):
 
   please use
 
-  @boost_adaptbx.python.inject_into(Crystal)
+  @boost_adaptbx.boost.python.inject_into(Crystal)
   class _(object):
   '''
   class __metaclass__(meta_class):
diff --git a/boost/rational.py b/boost/rational.py
index e460b729cb..1da934d1c8 100644
--- a/boost/rational.py
+++ b/boost/rational.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
-from boost_adaptbx.rational import *
+from boost_adaptbx.boost.rational import *
 import warnings
 
 warnings.warn(
   "importing from boost.rational is deprecated; this module will be removed shortly. "
-  "import from boost_adaptbx.rational instead. "
+  "import from boost_adaptbx.boost.rational instead. "
   "Please see https://github.com/cctbx/cctbx_project/issues/458 for more information.",
   FutureWarning,
   stacklevel=2
diff --git a/boost/std_pair.py b/boost/std_pair.py
index 163f027a11..83dbc27f00 100644
--- a/boost/std_pair.py
+++ b/boost/std_pair.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
-from boost_adaptbx.std_pair import *
+from boost_adaptbx.boost.std_pair import *
 import warnings
 
 warnings.warn(
   "importing from boost.std_pair is deprecated; this module will be removed shortly. "
-  "import from boost_adaptbx.std_pair instead. "
+  "import from boost_adaptbx.boost.std_pair instead. "
   "Please see https://github.com/cctbx/cctbx_project/issues/458 for more information.",
   FutureWarning,
   stacklevel=2
diff --git a/boost/tuple.py b/boost/tuple.py
index 7289c6dd1e..40d45ff3ce 100644
--- a/boost/tuple.py
+++ b/boost/tuple.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
-from boost_adaptbx.tuple import *
+from boost_adaptbx.boost.tuple import *
 import warnings
 
 warnings.warn(
   "importing from boost.tuple is deprecated; this module will be removed shortly. "
-  "import from boost_adaptbx.tuple instead. "
+  "import from boost_adaptbx.boost.tuple instead. "
   "Please see https://github.com/cctbx/cctbx_project/issues/458 for more information.",
   FutureWarning,
   stacklevel=2
diff --git a/boost_adaptbx/boost/optional.py b/boost_adaptbx/boost/optional.py
index e8d358325b..6957cd9126 100644
--- a/boost_adaptbx/boost/optional.py
+++ b/boost_adaptbx/boost/optional.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("boost_optional_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("boost_optional_ext")
 from boost_optional_ext import *
diff --git a/boost_adaptbx/boost/python.py b/boost_adaptbx/boost/python.py
index 0212787b4e..bae6858cc5 100644
--- a/boost_adaptbx/boost/python.py
+++ b/boost_adaptbx/boost/python.py
@@ -120,10 +120,10 @@ def fset(self, flag):
 class trapping(object):
   """ Synopsis:
 
-      >>> import boost_adaptbx.python
+      >>> import boost_adaptbx.boost.python as bp
       >>> from scitbx.array_family import flex
       >>> a = flex.double((0, 0, 0))
-      >>> with boost_adaptbx.python.trapping(division_by_zero=False):
+      >>> with bp.trapping(division_by_zero=False):
       >>>   b = 1/a
       >>> tuple(b)
       (inf, inf, inf)
@@ -154,7 +154,7 @@ def c_sizeof(typename):
     if (line.startswith(pattern)):
       break
   else:
-    raise RuntimeError('boost_adaptbx.python.platform_info: "%s" not found.' % pattern)
+    raise RuntimeError('bp.platform_info: "%s" not found.' % pattern)
   return int(line[len(pattern):])
 
 sizeof_void_ptr = c_sizeof("void*")
@@ -193,11 +193,11 @@ def inject(target_class, *mixin_classes):
             class _():
               def method(...):
                 ...
-            boost_adaptbx.python.inject(extension_class, _)
+            bp.inject(extension_class, _)
 
       instead of the previous mechanism of
 
-            class _(boost_adaptbx.python.injector, extension_class):
+            class _(bp.injector, extension_class):
               def method(...):
                 ...
 
@@ -217,7 +217,7 @@ def inject_into(target_class, *mixin_classes):
 
      It is used as follows:
 
-           @boost_adaptbx.python.inject_into(extension_class)
+           @bp.inject_into(extension_class)
            class _():
              def method(...):
                ...
diff --git a/boost_adaptbx/boost/rational.py b/boost_adaptbx/boost/rational.py
index be91c8d104..9ebc8d6037 100644
--- a/boost_adaptbx/boost/rational.py
+++ b/boost_adaptbx/boost/rational.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("boost_rational_ext")
+ext = bp.import_ext("boost_rational_ext")
 from boost_rational_ext import *
 
 builtin_int = __builtins__["int"]
diff --git a/boost_adaptbx/boost/std_pair.py b/boost_adaptbx/boost/std_pair.py
index 1002d273f7..0adc02d090 100644
--- a/boost_adaptbx/boost/std_pair.py
+++ b/boost_adaptbx/boost/std_pair.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("std_pair_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("std_pair_ext")
 from std_pair_ext import *
diff --git a/boost_adaptbx/boost/tuple.py b/boost_adaptbx/boost/tuple.py
index 1397f82d94..462e164b15 100644
--- a/boost_adaptbx/boost/tuple.py
+++ b/boost_adaptbx/boost/tuple.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("boost_tuple_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("boost_tuple_ext")
 from boost_tuple_ext import *
diff --git a/boost_adaptbx/command_line/divide_by_zero.py b/boost_adaptbx/command_line/divide_by_zero.py
index b0d506646e..0ec88f462f 100644
--- a/boost_adaptbx/command_line/divide_by_zero.py
+++ b/boost_adaptbx/command_line/divide_by_zero.py
@@ -2,7 +2,7 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.divide_by_zero
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
@@ -10,18 +10,18 @@ def run(args):
   if len(args) == 0:
     print("Now dividing by zero (in C++) ...")
     sys.stdout.flush()
-    result = boost_adaptbx.python.ext.divide_doubles(1, 0)
+    result = bp.ext.divide_doubles(1, 0)
     print("Result:", result)
   else:
-    boost_adaptbx.python.floating_point_exceptions.division_by_zero_trapped = False
+    bp.floating_point_exceptions.division_by_zero_trapped = False
     print("Dividing by zero in C++: not gonna be caught")
-    result = boost_adaptbx.python.ext.divide_doubles(1, 0)
+    result = bp.ext.divide_doubles(1, 0)
     print("Result:", result)
-    boost_adaptbx.python.floating_point_exceptions.division_by_zero_trapped = True
+    bp.floating_point_exceptions.division_by_zero_trapped = True
     print()
     print("Dividing by zero in C++: gonna crash")
     sys.stdout.flush()
-    result = boost_adaptbx.python.ext.divide_doubles(1, 0)
+    result = bp.ext.divide_doubles(1, 0)
     print("Result:", result)
 
 if (__name__ == "__main__"):
diff --git a/boost_adaptbx/command_line/double_overflow.py b/boost_adaptbx/command_line/double_overflow.py
index c98b2d81d8..ddca09dabc 100644
--- a/boost_adaptbx/command_line/double_overflow.py
+++ b/boost_adaptbx/command_line/double_overflow.py
@@ -2,18 +2,18 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.double_overflow
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
   assert len(args) == 0
-  sizeof_double = boost_adaptbx.python.c_sizeof("double")
+  sizeof_double = bp.c_sizeof("double")
   assert sizeof_double == 8
   x = 1.e300
   y = 1.e200
   print("Now multiplying double values %g * %g ..." % (x, y))
   sys.stdout.flush()
-  result = boost_adaptbx.python.ext.multiply_doubles(x, y)
+  result = bp.ext.multiply_doubles(x, y)
   print("Result:", result)
 
 if (__name__ == "__main__"):
diff --git a/boost_adaptbx/command_line/gcd.py b/boost_adaptbx/command_line/gcd.py
index d83e3a0159..2261269740 100644
--- a/boost_adaptbx/command_line/gcd.py
+++ b/boost_adaptbx/command_line/gcd.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-from boost_adaptbx.rational import gcd
+from boost_adaptbx.boost.rational import gcd
 from libtbx.utils import Usage
 import libtbx.load_env
 import sys
diff --git a/boost_adaptbx/command_line/inexact.py b/boost_adaptbx/command_line/inexact.py
index 5f4ae9d113..001627b247 100644
--- a/boost_adaptbx/command_line/inexact.py
+++ b/boost_adaptbx/command_line/inexact.py
@@ -2,14 +2,14 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.inexact
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
   assert len(args) == 0
   print("Now creating a NaN in C++ as 0/0 ...")
   sys.stdout.flush()
-  result = boost_adaptbx.python.ext.divide_doubles(0, 0)
+  result = bp.ext.divide_doubles(0, 0)
   print("Result:", result)
 
 if (__name__ == "__main__"):
diff --git a/boost_adaptbx/command_line/int_overflow.py b/boost_adaptbx/command_line/int_overflow.py
index 48946d6189..783df60d03 100644
--- a/boost_adaptbx/command_line/int_overflow.py
+++ b/boost_adaptbx/command_line/int_overflow.py
@@ -2,17 +2,17 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.int_overflow
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
   assert len(args) == 0
   for itype in ["int", "long"]:
-    sizeof_itype = boost_adaptbx.python.c_sizeof(itype)
+    sizeof_itype = bp.c_sizeof(itype)
     imax = 2**(8*sizeof_itype-1)-1
     print("Now adding %s values %d + 1 ..." % (itype, imax))
     sys.stdout.flush()
-    result = getattr(boost_adaptbx.python.ext, "add_%ss" % itype)(imax, 1)
+    result = getattr(bp.ext, "add_%ss" % itype)(imax, 1)
     print("Result:", result)
 
 if (__name__ == "__main__"):
diff --git a/boost_adaptbx/command_line/lcm.py b/boost_adaptbx/command_line/lcm.py
index a0cdffbf9b..fd1cdbf450 100644
--- a/boost_adaptbx/command_line/lcm.py
+++ b/boost_adaptbx/command_line/lcm.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import gcd
-from boost_adaptbx.rational import lcm
+from boost_adaptbx.boost.rational import lcm
 import sys
 
 def run(args):
diff --git a/boost_adaptbx/command_line/nested_cpp_loops_with_check_signals.py b/boost_adaptbx/command_line/nested_cpp_loops_with_check_signals.py
index bf7f4549e3..aa55f554c2 100644
--- a/boost_adaptbx/command_line/nested_cpp_loops_with_check_signals.py
+++ b/boost_adaptbx/command_line/nested_cpp_loops_with_check_signals.py
@@ -4,8 +4,8 @@
 
 def run(args):
   assert len(args) == 2, "iterations_outer, iterations_inner"
-  import boost_adaptbx.python
-  count = boost_adaptbx.python.ext.nested_cpp_loops_with_check_signals(
+  import boost_adaptbx.boost.python as bp
+  count = bp.ext.nested_cpp_loops_with_check_signals(
     iterations_outer=int(args[0]),
     iterations_inner=int(args[1]))
   print("actual iterations outer:", count)
diff --git a/boost_adaptbx/command_line/segmentation_fault.py b/boost_adaptbx/command_line/segmentation_fault.py
index f2266f90fc..ac4a63111d 100644
--- a/boost_adaptbx/command_line/segmentation_fault.py
+++ b/boost_adaptbx/command_line/segmentation_fault.py
@@ -2,14 +2,14 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.segmentation_fault
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
   assert len(args) == 0
   print("Now dereferencing null-pointer ...")
   sys.stdout.flush()
-  result = boost_adaptbx.python.ext.dereference_char_pointer(None)
+  result = bp.ext.dereference_char_pointer(None)
   print("Result:", result)
 
 if (__name__ == "__main__"):
diff --git a/boost_adaptbx/command_line/show_platform_info.py b/boost_adaptbx/command_line/show_platform_info.py
index b3aba2cc3b..aa4d3288e1 100644
--- a/boost_adaptbx/command_line/show_platform_info.py
+++ b/boost_adaptbx/command_line/show_platform_info.py
@@ -2,7 +2,7 @@
 
 # LIBTBX_SET_DISPATCHER_NAME boost_adaptbx.show_platform_info
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from libtbx import introspection
 import libtbx.load_env
 import platform
@@ -15,7 +15,7 @@ def __truediv__(O, other): return "true"
 
 def run(out=None, omit_unicode_experiment=False):
   if (out is None): out = sys.stdout
-  out.write(boost_adaptbx.python.platform_info)
+  out.write(bp.platform_info)
   tag = libtbx.env.under_dist("boost", "TAG")
   if (op.isfile(tag)):
     tag = open(tag).read().strip()
@@ -29,7 +29,7 @@ def run(out=None, omit_unicode_experiment=False):
   print("platform.architecture():", platform.architecture(), file=out)
   for attr in ["division_by_zero", "invalid", "overflow"]:
     attr = "floating_point_exceptions.%s_trapped" % attr
-    print("%s:" % attr, eval("boost_adaptbx.python.%s" % attr), file=out)
+    print("%s:" % attr, eval("bp.%s" % attr), file=out)
   print("number of processors:", introspection.number_of_processors(
     return_value_if_unknown="unknown"), file=out)
   introspection.machine_memory_info().show(out=out)
@@ -37,7 +37,7 @@ def run(out=None, omit_unicode_experiment=False):
   except ImportError: print("import thread: NO", file=out)
   else: print("import thread: OK", file=out)
   print("Division operator semantics: %s division" % (div_probe() / 0))
-  c = getattr(boost_adaptbx.python.ext, "str_or_unicode_as_char_list", None)
+  c = getattr(bp.ext, "str_or_unicode_as_char_list", None)
   if (c is not None and not omit_unicode_experiment):
     print('"hello" =', c("hello"), file=out)
     print('u"hello" =', c(u"hello"), file=out)
diff --git a/boost_adaptbx/graph/__init__.py b/boost_adaptbx/graph/__init__.py
index 0d8baa926f..671fb14ec1 100644
--- a/boost_adaptbx/graph/__init__.py
+++ b/boost_adaptbx/graph/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_ext" )
 from boost_adaptbx_graph_ext import *
 
 _abbreviation_for_component = {
@@ -42,4 +42,3 @@ def adjacency_list(
 
   except AttributeError:
     raise NotImplementedError
-
diff --git a/boost_adaptbx/graph/breadth_first_search.py b/boost_adaptbx/graph/breadth_first_search.py
index 8a949a234b..c54885d80a 100644
--- a/boost_adaptbx/graph/breadth_first_search.py
+++ b/boost_adaptbx/graph/breadth_first_search.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_breadth_first_search_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_breadth_first_search_ext" )
 from boost_adaptbx_graph_breadth_first_search_ext import *
 
 class visitor(object):
@@ -121,4 +121,3 @@ def tree_edge(self, edge, graph):
     source = graph.source( edge )
     target = graph.target( edge )
     self.distance_for[ target ] = self.distance_for[ source ] + 1
-
diff --git a/boost_adaptbx/graph/clustering_algorithm.py b/boost_adaptbx/graph/clustering_algorithm.py
index 04fc9bbbab..e26aa45f83 100644
--- a/boost_adaptbx/graph/clustering_algorithm.py
+++ b/boost_adaptbx/graph/clustering_algorithm.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_clustering_algorithm_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_clustering_algorithm_ext" )
 
 from boost_adaptbx_graph_clustering_algorithm_ext import *
diff --git a/boost_adaptbx/graph/connected_component_algorithm.py b/boost_adaptbx/graph/connected_component_algorithm.py
index ff9d4314c9..b75fefedfc 100644
--- a/boost_adaptbx/graph/connected_component_algorithm.py
+++ b/boost_adaptbx/graph/connected_component_algorithm.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_connected_component_algorithm_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_connected_component_algorithm_ext" )
 
 
 def connected_components(graph):
@@ -12,4 +12,3 @@ def connected_components(graph):
     result.setdefault( component, [] ).append( desc )
 
   return list(result.values())
-
diff --git a/boost_adaptbx/graph/graph_structure_comparison.py b/boost_adaptbx/graph/graph_structure_comparison.py
index 6c4f5fe216..539d1530fc 100644
--- a/boost_adaptbx/graph/graph_structure_comparison.py
+++ b/boost_adaptbx/graph/graph_structure_comparison.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_graph_structure_comparison_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_graph_structure_comparison_ext" )
 from boost_adaptbx_graph_graph_structure_comparison_ext import *
-
diff --git a/boost_adaptbx/graph/maximum_clique.py b/boost_adaptbx/graph/maximum_clique.py
index 33a64c86ff..99fd0d1c3a 100644
--- a/boost_adaptbx/graph/maximum_clique.py
+++ b/boost_adaptbx/graph/maximum_clique.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from functools import reduce
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_maximum_clique_ext" )
+ext = bp.import_ext( "boost_adaptbx_graph_maximum_clique_ext" )
 import operator
 
 rascal = ext.rascal
@@ -143,4 +143,3 @@ def __call__(self, graph, partition):
       bound += min( len( first_tagged[ v ] ), len( second_tagged[ v ] ) )
 
     return bound
-
diff --git a/boost_adaptbx/graph/metric.py b/boost_adaptbx/graph/metric.py
index 0111ee5704..b91749d06c 100644
--- a/boost_adaptbx/graph/metric.py
+++ b/boost_adaptbx/graph/metric.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_metric_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_metric_ext" )
 
 from boost_adaptbx_graph_metric_ext import *
diff --git a/boost_adaptbx/graph/min_cut_max_flow.py b/boost_adaptbx/graph/min_cut_max_flow.py
index f09cac06de..ceb5757c22 100644
--- a/boost_adaptbx/graph/min_cut_max_flow.py
+++ b/boost_adaptbx/graph/min_cut_max_flow.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_min_cut_max_flow_ext" )
+ext = bp.import_ext( "boost_adaptbx_graph_min_cut_max_flow_ext" )
 
 def group_vertices(graph, parities):
 
diff --git a/boost_adaptbx/graph/tests/tst_graph.py b/boost_adaptbx/graph/tests/tst_graph.py
index 11e6d7cf4a..bcda1cd85b 100644
--- a/boost_adaptbx/graph/tests/tst_graph.py
+++ b/boost_adaptbx/graph/tests/tst_graph.py
@@ -177,4 +177,3 @@ def load_tests(loader, tests, pattern):
 
 if __name__ == "__main__":
   unittest.TextTestRunner( verbosity = 2 ).run( alltests )
-
diff --git a/boost_adaptbx/graph/tests/tst_graph_connected_component_algorithm.py b/boost_adaptbx/graph/tests/tst_graph_connected_component_algorithm.py
index 4f3fc73483..d62567bd7d 100644
--- a/boost_adaptbx/graph/tests/tst_graph_connected_component_algorithm.py
+++ b/boost_adaptbx/graph/tests/tst_graph_connected_component_algorithm.py
@@ -106,4 +106,3 @@ def load_tests(loader, tests, pattern):
 
 if __name__ == "__main__":
   unittest.TextTestRunner( verbosity = 2 ).run( alltests )
-
diff --git a/boost_adaptbx/graph/tests/tst_graph_graph_structure_comparison.py b/boost_adaptbx/graph/tests/tst_graph_graph_structure_comparison.py
index 68f03abcf5..502de43ab4 100644
--- a/boost_adaptbx/graph/tests/tst_graph_graph_structure_comparison.py
+++ b/boost_adaptbx/graph/tests/tst_graph_graph_structure_comparison.py
@@ -225,4 +225,3 @@ def load_tests(loader, tests, pattern):
 
 if __name__ == "__main__":
   unittest.TextTestRunner( verbosity = 2 ).run( alltests )
-
diff --git a/boost_adaptbx/graph/utility.py b/boost_adaptbx/graph/utility.py
index 42d8a51d84..2dae729d41 100644
--- a/boost_adaptbx/graph/utility.py
+++ b/boost_adaptbx/graph/utility.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "boost_adaptbx_graph_utility_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "boost_adaptbx_graph_utility_ext" )
 
 def copy_graph(graph):
 
diff --git a/boost_adaptbx/tests/tst_boost_thread.py b/boost_adaptbx/tests/tst_boost_thread.py
index 3fe97e5b81..eae64a32f7 100644
--- a/boost_adaptbx/tests/tst_boost_thread.py
+++ b/boost_adaptbx/tests/tst_boost_thread.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("boost_adaptbx_boost_thread_test_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("boost_adaptbx_boost_thread_test_ext")
 
 from libtbx.test_utils import approx_equal
 import math
diff --git a/boost_adaptbx/tests/tst_libc_backtrace.py b/boost_adaptbx/tests/tst_libc_backtrace.py
index 9093652e2c..a9bea675fa 100644
--- a/boost_adaptbx/tests/tst_libc_backtrace.py
+++ b/boost_adaptbx/tests/tst_libc_backtrace.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 def run(args):
   forever = "--forever" in args
   while True:
-    boost_adaptbx.python.ext.libtbx_introspection_show_stack()
-    boost_adaptbx.python.ext.boost_adaptbx_libc_backtrace(0)
+    bp.ext.libtbx_introspection_show_stack()
+    bp.ext.boost_adaptbx_libc_backtrace(0)
     if (not forever): break
   print("OK")
 
diff --git a/boost_adaptbx/tests/tst_optional.py b/boost_adaptbx/tests/tst_optional.py
index 8ad4c0167d..bdcd1dc90c 100644
--- a/boost_adaptbx/tests/tst_optional.py
+++ b/boost_adaptbx/tests/tst_optional.py
@@ -1,27 +1,27 @@
 from __future__ import absolute_import, division, print_function
 
 from libtbx.test_utils import Exception_expected
-import boost_adaptbx.optional
+import boost_adaptbx.boost.optional
 import sys
 
 def exercise(args):
   forever = "--forever" in args
   while True:
-    assert boost_adaptbx.optional.exercise(None) == 42
-    assert boost_adaptbx.optional.exercise(13) is None
-    assert boost_adaptbx.optional.exercise(0) == 0
-    assert boost_adaptbx.optional.exercise(1) == 3
-    assert boost_adaptbx.optional.exercise(1.5) == 4
+    assert boost_adaptbx.boost.optional.exercise(None) == 42
+    assert boost_adaptbx.boost.optional.exercise(13) is None
+    assert boost_adaptbx.boost.optional.exercise(0) == 0
+    assert boost_adaptbx.boost.optional.exercise(1) == 3
+    assert boost_adaptbx.boost.optional.exercise(1.5) == 4
     try:
-      boost_adaptbx.optional.exercise("")
+      boost_adaptbx.boost.optional.exercise("")
     except Exception as e:
       assert str(e).splitlines()[2] == "did not match C++ signature:"
     else:
       raise Exception_expected
-    exercise_wstring = getattr(boost_adaptbx.optional, "exercise_wstring", None)
+    exercise_wstring = getattr(boost_adaptbx.boost.optional, "exercise_wstring", None)
     if (not forever): print("exercise_wstring:", exercise_wstring)
     if (exercise_wstring is not None):
-      assert boost_adaptbx.optional.exercise_wstring(u"abc") == u"abcabc"
+      assert boost_adaptbx.boost.optional.exercise_wstring(u"abc") == u"abcabc"
     if (not forever): break
   print("OK")
 
diff --git a/boost_adaptbx/tests/tst_python_streambuf.py b/boost_adaptbx/tests/tst_python_streambuf.py
index c407a6d6b0..19ff256341 100644
--- a/boost_adaptbx/tests/tst_python_streambuf.py
+++ b/boost_adaptbx/tests/tst_python_streambuf.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-from boost_adaptbx.python import streambuf, ostream
+import boost_adaptbx.boost.python as bp
+from boost_adaptbx.boost.python import streambuf, ostream
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("boost_adaptbx_python_streambuf_test_ext")
+ext = bp.import_ext("boost_adaptbx_python_streambuf_test_ext")
 import StringIO
 import cStringIO
 from libtbx.test_utils import Exception_expected
diff --git a/boost_adaptbx/tests/tst_rational.py b/boost_adaptbx/tests/tst_rational.py
index 2020ca1a99..03d5e2fb83 100644
--- a/boost_adaptbx/tests/tst_rational.py
+++ b/boost_adaptbx/tests/tst_rational.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from libtbx.test_utils import Exception_expected, approx_equal, show_diff
 from six.moves import range
 from six.moves import zip
diff --git a/boost_adaptbx/tests/tst_std_pair.py b/boost_adaptbx/tests/tst_std_pair.py
index 36c7564522..6d979123e6 100644
--- a/boost_adaptbx/tests/tst_std_pair.py
+++ b/boost_adaptbx/tests/tst_std_pair.py
@@ -1,28 +1,28 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.std_pair
+import boost_adaptbx.boost.std_pair
 from libtbx.test_utils import Exception_expected
 
 def run():
-  boost_adaptbx.std_pair.exercise(( 1, 2)) == ( 2, 1.)
-  boost_adaptbx.std_pair.exercise((-2, 4)) == (-4, 2.)
+  boost_adaptbx.boost.std_pair.exercise(( 1, 2)) == ( 2, 1.)
+  boost_adaptbx.boost.std_pair.exercise((-2, 4)) == (-4, 2.)
 
   try:
-    boost_adaptbx.std_pair.exercise(1)
+    boost_adaptbx.boost.std_pair.exercise(1)
   except Exception as err:
     assert err.__class__.__name__ == 'ArgumentError'
   else:
     raise Exception_expected
 
   try:
-    boost_adaptbx.std_pair.exercise((1,))
+    boost_adaptbx.boost.std_pair.exercise((1,))
   except Exception as err:
     assert err.__class__.__name__ == 'ArgumentError'
   else:
     raise Exception_expected
 
   try:
-    boost_adaptbx.std_pair.exercise((1,2,3,))
+    boost_adaptbx.boost.std_pair.exercise((1,2,3,))
   except Exception as err:
     assert err.__class__.__name__ == 'ArgumentError'
   else:
diff --git a/boost_adaptbx/tests/tst_stderr_stdout.py b/boost_adaptbx/tests/tst_stderr_stdout.py
index e7dc479482..9a5e96b60e 100644
--- a/boost_adaptbx/tests/tst_stderr_stdout.py
+++ b/boost_adaptbx/tests/tst_stderr_stdout.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-from boost_adaptbx.python import ostream
+import boost_adaptbx.boost.python as bp
+from boost_adaptbx.boost.python import ostream
 import libtbx.object_oriented_patterns as oop
 import sys
 import gc
@@ -14,7 +14,7 @@ def tell(self):
     raise NotImplementedError("Test of stdout/stderr / C++ stream bridge")
 
 def run():
-  ext = boost_adaptbx.python.import_ext("boost_adaptbx_python_streambuf_test_ext")
+  ext = bp.import_ext("boost_adaptbx_python_streambuf_test_ext")
   ext.call_with_stderr_stdout_do_nothing(
     ostream(sys.stderr),
     ostream(sys.stdout))
diff --git a/boost_adaptbx/tests/tst_stdin.py b/boost_adaptbx/tests/tst_stdin.py
index b00a5e9869..7d73d78b29 100644
--- a/boost_adaptbx/tests/tst_stdin.py
+++ b/boost_adaptbx/tests/tst_stdin.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-from boost_adaptbx.python import streambuf
-ext = boost_adaptbx.python.import_ext("boost_adaptbx_python_streambuf_test_ext")
+import boost_adaptbx.boost.python as bp
+from boost_adaptbx.boost.python import streambuf
+ext = bp.import_ext("boost_adaptbx_python_streambuf_test_ext")
 import subprocess
 import sys
 
diff --git a/boost_adaptbx/tests/tst_stdout.py b/boost_adaptbx/tests/tst_stdout.py
index 17dd54d635..803ece7a91 100644
--- a/boost_adaptbx/tests/tst_stdout.py
+++ b/boost_adaptbx/tests/tst_stdout.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-from boost_adaptbx.python import ostream
-ext = boost_adaptbx.python.import_ext("boost_adaptbx_python_streambuf_test_ext")
+import boost_adaptbx.boost.python as bp
+from boost_adaptbx.boost.python import ostream
+ext = bp.import_ext("boost_adaptbx_python_streambuf_test_ext")
 import subprocess
 import sys
 
diff --git a/boost_adaptbx/tests/tst_string_representation.py b/boost_adaptbx/tests/tst_string_representation.py
index 69678b899c..a3d51ae508 100644
--- a/boost_adaptbx/tests/tst_string_representation.py
+++ b/boost_adaptbx/tests/tst_string_representation.py
@@ -2,8 +2,8 @@
 from six.moves import range
 
 def exercise():
-  import boost_adaptbx.python
-  csr = boost_adaptbx.python.ext.string_representation
+  import boost_adaptbx.boost.python as bp
+  csr = bp.ext.string_representation
   from libtbx.str_utils import py_string_representation as psr
   for sr in [csr, psr]:
     assert sr("a", '"', "'") == '"a"'
diff --git a/boost_adaptbx/tests/tst_tuple.py b/boost_adaptbx/tests/tst_tuple.py
index 3e64d5a89e..9d52d56964 100644
--- a/boost_adaptbx/tests/tst_tuple.py
+++ b/boost_adaptbx/tests/tst_tuple.py
@@ -1,12 +1,12 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.tuple
+import boost_adaptbx.boost.tuple
 
 def exercise():
-  doc = boost_adaptbx.tuple.exercise.__doc__
+  doc = boost_adaptbx.boost.tuple.exercise.__doc__
   assert doc.replace("\n","").startswith("exercise(")
-  assert boost_adaptbx.tuple.exercise(1) == (2, 0.5)
-  assert boost_adaptbx.tuple.exercise(2) == (4, 1)
+  assert boost_adaptbx.boost.tuple.exercise(1) == (2, 0.5)
+  assert boost_adaptbx.boost.tuple.exercise(2) == (4, 1)
 
 def run():
   exercise()
diff --git a/cctbx/adp_restraints/__init__.py b/cctbx/adp_restraints/__init__.py
index afe3c7f0ad..cd7b455991 100644
--- a/cctbx/adp_restraints/__init__.py
+++ b/cctbx/adp_restraints/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_adp_restraints_ext")
+ext = bp.import_ext("cctbx_adp_restraints_ext")
 from cctbx_adp_restraints_ext import *
 
 from cctbx import crystal
@@ -135,7 +135,7 @@ def __init__(self, xray_structure, restraints_manager, use_hd,
     self.gradients_aniso_star = adptbx.grad_u_cart_as_u_star(unit_cell,
                                                self.gradients_aniso_cart)
 
-@boost_adaptbx.python.inject_into(adp_similarity)
+@bp.inject_into(adp_similarity)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -159,7 +159,7 @@ def _show_sorted_item(self, f, prefix):
         prefix, adp_label, delta, weight_as_sigma(weight=self.weight), self.weight, rdr), file=f)
       rdr = ""
 
-@boost_adaptbx.python.inject_into(shared_adp_similarity_proxy)
+@bp.inject_into(shared_adp_similarity_proxy)
 class _():
 
   def deltas_rms(self, params):
@@ -186,7 +186,7 @@ def show_sorted(self,
         site_labels=site_labels, f=f, prefix=prefix,
         max_items=max_items)
 
-@boost_adaptbx.python.inject_into(adp_u_eq_similarity)
+@bp.inject_into(adp_u_eq_similarity)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -195,7 +195,7 @@ def _show_sorted_item(self, f, prefix):
       %(prefix, self.weight, weight_as_sigma(weight=self.weight),
         self.rms_deltas(), self.residual()), file=f)
 
-@boost_adaptbx.python.inject_into(shared_adp_u_eq_similarity_proxy)
+@bp.inject_into(shared_adp_u_eq_similarity_proxy)
 class _():
 
   def deltas_rms(self, params):
@@ -222,7 +222,7 @@ def show_sorted(self,
         site_labels=site_labels, f=f, prefix=prefix,
         max_items=max_items)
 
-@boost_adaptbx.python.inject_into(adp_volume_similarity)
+@bp.inject_into(adp_volume_similarity)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -231,7 +231,7 @@ def _show_sorted_item(self, f, prefix):
       %(prefix, self.weight, weight_as_sigma(weight=self.weight),
         self.rms_deltas(), self.residual()), file=f)
 
-@boost_adaptbx.python.inject_into(shared_adp_volume_similarity_proxy)
+@bp.inject_into(shared_adp_volume_similarity_proxy)
 class _():
 
   def deltas_rms(self, params):
@@ -258,7 +258,7 @@ def show_sorted(self,
         site_labels=site_labels, f=f, prefix=prefix,
         max_items=max_items)
 
-@boost_adaptbx.python.inject_into(isotropic_adp)
+@bp.inject_into(isotropic_adp)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -273,7 +273,7 @@ def _show_sorted_item(self, f, prefix):
         self.weight, rdr), file=f)
       rdr = ""
 
-@boost_adaptbx.python.inject_into(shared_isotropic_adp_proxy)
+@bp.inject_into(shared_isotropic_adp_proxy)
 class _():
 
   def deltas_rms(self, params):
@@ -301,7 +301,7 @@ def show_sorted(self,
         max_items=max_items)
 
 
-@boost_adaptbx.python.inject_into(fixed_u_eq_adp)
+@bp.inject_into(fixed_u_eq_adp)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -313,7 +313,7 @@ def _show_sorted_item(self, f, prefix):
       prefix, adp_label, self.delta(), weight_as_sigma(weight=self.weight),
       self.weight, rdr), file=f)
 
-@boost_adaptbx.python.inject_into(shared_fixed_u_eq_adp_proxy)
+@bp.inject_into(shared_fixed_u_eq_adp_proxy)
 class _():
 
   def deltas_rms(self, params):
@@ -341,7 +341,7 @@ def show_sorted(self,
         max_items=max_items)
 
 
-@boost_adaptbx.python.inject_into(rigid_bond)
+@bp.inject_into(rigid_bond)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -350,7 +350,7 @@ def _show_sorted_item(self, f, prefix):
       prefix, self.delta_z(), weight_as_sigma(weight=self.weight),
       self.weight, self.residual()), file=f)
 
-@boost_adaptbx.python.inject_into(shared_rigid_bond_proxy)
+@bp.inject_into(shared_rigid_bond_proxy)
 class _():
 
   def deltas(self, params):
@@ -376,7 +376,7 @@ def show_sorted(self,
         site_labels=site_labels, f=f, prefix=prefix,
         max_items=max_items)
 
-@boost_adaptbx.python.inject_into(rigu)
+@bp.inject_into(rigu)
 class _():
 
   def _show_sorted_item(self, f, prefix):
@@ -391,7 +391,7 @@ def _show_sorted_item(self, f, prefix):
       prefix, self.delta_13(), weight_as_sigma(weight=self.weight),
       self.weight, self.residual23()), file=f)
 
-@boost_adaptbx.python.inject_into(shared_rigu_proxy)
+@bp.inject_into(shared_rigu_proxy)
 class _():
 
   def deltas(self, params):
diff --git a/cctbx/adptbx.py b/cctbx/adptbx.py
index 8138fe7306..49e76a55eb 100644
--- a/cctbx/adptbx.py
+++ b/cctbx/adptbx.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex # for tuple mappings
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_adptbx_ext")
+ext = bp.import_ext("cctbx_adptbx_ext")
 from cctbx_adptbx_ext import *
 
 import scitbx.math
diff --git a/cctbx/array_family/flex.py b/cctbx/array_family/flex.py
index 85c0316a3b..d4d6941eb5 100644
--- a/cctbx/array_family/flex.py
+++ b/cctbx/array_family/flex.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.array_family.flex
 
-import boost_adaptbx.python
-ext_ = boost_adaptbx.python.import_ext("cctbx_array_family_flex_ext")
+import boost_adaptbx.boost.python as bp
+ext_ = bp.import_ext("cctbx_array_family_flex_ext")
 from scitbx_array_family_flex_ext import *
 from cctbx_array_family_flex_ext import *
 ext = ext_
diff --git a/cctbx/covariance/__init__.py b/cctbx/covariance/__init__.py
index d779bfef6f..0d236aa130 100644
--- a/cctbx/covariance/__init__.py
+++ b/cctbx/covariance/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("cctbx_covariance_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("cctbx_covariance_ext")
 from cctbx_covariance_ext import *
diff --git a/cctbx/crystal/__init__.py b/cctbx/crystal/__init__.py
index e54cbe579c..6877ba899c 100644
--- a/cctbx/crystal/__init__.py
+++ b/cctbx/crystal/__init__.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 # -*- coding: utf-8 -*-
 from cctbx.array_family import flex
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_crystal_ext")
+ext = bp.import_ext("cctbx_crystal_ext")
 from cctbx_crystal_ext import *
 from cctbx.crystal.find_best_cell import find_best_cell
 from cctbx import sgtbx
@@ -791,7 +791,7 @@ def correct_special_position(
     return site_special_frac
   return unit_cell.orthogonalize(site_special_frac)
 
-@boost_adaptbx.python.inject_into(pair_asu_table)
+@bp.inject_into(pair_asu_table)
 class _():
 
   def as_nested_lists(self):
@@ -1403,7 +1403,7 @@ def __init__(self, i_seq, j_seq, rt_mx_ji):
   def i_seqs(self):
     return (self.i_seq, self.j_seq)
 
-@boost_adaptbx.python.inject_into(pair_sym_table)
+@bp.inject_into(pair_sym_table)
 class _():
 
   def iterator(self):
@@ -1978,5 +1978,5 @@ def unit_crystal_symmetry():
   from cctbx import crystal
   return crystal.symmetry(unit_cell=uc,space_group_info=sg)
 
-boost_adaptbx.python.inject(ext.neighbors_simple_pair_generator, boost_adaptbx.python.py3_make_iterator)
-boost_adaptbx.python.inject_into(ext.neighbors_fast_pair_generator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.neighbors_simple_pair_generator, bp.py3_make_iterator)
+bp.inject_into(ext.neighbors_fast_pair_generator, bp.py3_make_iterator)
diff --git a/cctbx/crystal/direct_space_asu.py b/cctbx/crystal/direct_space_asu.py
index bf3fad3af4..06f48f4369 100644
--- a/cctbx/crystal/direct_space_asu.py
+++ b/cctbx/crystal/direct_space_asu.py
@@ -5,7 +5,7 @@
 import cctbx.sgtbx.direct_space_asu
 from cctbx.array_family import flex
 from scitbx.math import minimum_covering_sphere
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 
 float_cut_plane = crystal.direct_space_asu_float_cut_plane
 float_asu = crystal.direct_space_asu_float_asu
@@ -41,7 +41,7 @@ def add_buffer(self, thickness=None, relative_thickness=None,
       thickness=thickness,
       relative_thickness=relative_thickness)
 
-@boost_adaptbx.python.inject_into(float_asu)
+@bp.inject_into(float_asu)
 class _():
 
   def add_buffer(self, thickness=None, relative_thickness=None):
@@ -52,7 +52,7 @@ def add_buffer(self, thickness=None, relative_thickness=None):
       thickness = self.unit_cell().volume()**(1/3.)*relative_thickness
     return self._add_buffer(thickness)
 
-@boost_adaptbx.python.inject_into(asu_mappings)
+@bp.inject_into(asu_mappings)
 class _():
 
   def get_rt_mx_ji(self, pair):
diff --git a/cctbx/crystal_orientation.py b/cctbx/crystal_orientation.py
index 2bf34cc6dc..4c86c2afff 100644
--- a/cctbx/crystal_orientation.py
+++ b/cctbx/crystal_orientation.py
@@ -1,15 +1,15 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 from cctbx import uctbx # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_orientation_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_orientation_ext")
 from cctbx_orientation_ext import *
 
 class basis_type:
   direct = False
   reciprocal = True
 
-@boost_adaptbx.python.inject_into(ext.crystal_orientation)
+@bp.inject_into(ext.crystal_orientation)
 class _():
 
   def __getattr__(self,tag):
diff --git a/cctbx/dmtbx.py b/cctbx/dmtbx.py
index f74b68c51f..4c92c847ef 100644
--- a/cctbx/dmtbx.py
+++ b/cctbx/dmtbx.py
@@ -1,11 +1,11 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_dmtbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_dmtbx_ext")
 from cctbx_dmtbx_ext import *
 
-@boost_adaptbx.python.inject_into(weighted_triplet_phase_relation)
+@bp.inject_into(weighted_triplet_phase_relation)
 class _():
 
   def format(self, miller_indices, ih=None):
@@ -27,7 +27,7 @@ def triplet_generator(miller_set,
     amplitudes, max_relations_per_reflection,
     sigma_2_only, discard_weights)
 
-@boost_adaptbx.python.inject_into(ext.triplet_generator)
+@bp.inject_into(ext.triplet_generator)
 class _():
 
   def apply_tangent_formula(self, amplitudes, phases_rad,
diff --git a/cctbx/eltbx/attenuation_coefficient.py b/cctbx/eltbx/attenuation_coefficient.py
index 451eab7c58..bb6d4e3b9d 100644
--- a/cctbx/eltbx/attenuation_coefficient.py
+++ b/cctbx/eltbx/attenuation_coefficient.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex # import dependency
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_attenuation_coefficient_ext")
+ext = bp.import_ext("cctbx_eltbx_attenuation_coefficient_ext")
 from cctbx_eltbx_attenuation_coefficient_ext import *
 
 
diff --git a/cctbx/eltbx/chemical_elements.py b/cctbx/eltbx/chemical_elements.py
index 6c67f1e185..1874fcaffb 100644
--- a/cctbx/eltbx/chemical_elements.py
+++ b/cctbx/eltbx/chemical_elements.py
@@ -5,8 +5,8 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.stl.set # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_chemical_elements_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_chemical_elements_ext")
 from cctbx_eltbx_chemical_elements_ext import *
 
 proper_caps_set.__doc__ = """
diff --git a/cctbx/eltbx/covalent_radii.py b/cctbx/eltbx/covalent_radii.py
index 5245604248..646bbe094f 100644
--- a/cctbx/eltbx/covalent_radii.py
+++ b/cctbx/eltbx/covalent_radii.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_covalent_radii_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_covalent_radii_ext")
 from cctbx_eltbx_covalent_radii_ext import *
 
-boost_adaptbx.python.inject(ext.table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/fp_fdp.py b/cctbx/eltbx/fp_fdp.py
index b4dc7d6108..4e74734855 100644
--- a/cctbx/eltbx/fp_fdp.py
+++ b/cctbx/eltbx/fp_fdp.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_fp_fdp_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_fp_fdp_ext")
 from cctbx_eltbx_fp_fdp_ext import *
diff --git a/cctbx/eltbx/henke.py b/cctbx/eltbx/henke.py
index 5d4c7baef7..f010d0c425 100644
--- a/cctbx/eltbx/henke.py
+++ b/cctbx/eltbx/henke.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.eltbx.fp_fdp # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_henke_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_henke_ext")
 from cctbx_eltbx_henke_ext import *
 
-boost_adaptbx.python.inject(ext.table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/icsd_radii.py b/cctbx/eltbx/icsd_radii.py
index c2bb01ce66..3271c17fe4 100644
--- a/cctbx/eltbx/icsd_radii.py
+++ b/cctbx/eltbx/icsd_radii.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_icsd_radii_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_icsd_radii_ext")
 from cctbx_eltbx_icsd_radii_ext import *
 
-boost_adaptbx.python.inject(ext.table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/neutron.py b/cctbx/eltbx/neutron.py
index 1ba7fda212..7da1e8c786 100644
--- a/cctbx/eltbx/neutron.py
+++ b/cctbx/eltbx/neutron.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_neutron_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_neutron_ext")
 from cctbx_eltbx_neutron_ext import *
 
-boost_adaptbx.python.inject(ext.neutron_news_1992_table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.neutron_news_1992_table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/sasaki.py b/cctbx/eltbx/sasaki.py
index 5ec0f1d040..df42ee7a1f 100644
--- a/cctbx/eltbx/sasaki.py
+++ b/cctbx/eltbx/sasaki.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.eltbx.fp_fdp # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_sasaki_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_sasaki_ext")
 from cctbx_eltbx_sasaki_ext import *
 
-boost_adaptbx.python.inject(ext.table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/tiny_pse.py b/cctbx/eltbx/tiny_pse.py
index d55398042e..610b8566c1 100644
--- a/cctbx/eltbx/tiny_pse.py
+++ b/cctbx/eltbx/tiny_pse.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_tiny_pse_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_tiny_pse_ext")
 from cctbx_eltbx_tiny_pse_ext import *
 
-boost_adaptbx.python.inject(ext.table_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.table_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/wavelengths.py b/cctbx/eltbx/wavelengths.py
index 4baf55b31f..c53ef1b139 100644
--- a/cctbx/eltbx/wavelengths.py
+++ b/cctbx/eltbx/wavelengths.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_wavelengths_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_eltbx_wavelengths_ext")
 from cctbx_eltbx_wavelengths_ext import *
 
-boost_adaptbx.python.inject(ext.characteristic_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.characteristic_iterator, bp.py3_make_iterator)
diff --git a/cctbx/eltbx/xray_scattering/__init__.py b/cctbx/eltbx/xray_scattering/__init__.py
index 6edc8dd601..ba86b5ea54 100644
--- a/cctbx/eltbx/xray_scattering/__init__.py
+++ b/cctbx/eltbx/xray_scattering/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.math.gaussian # base class for gaussian
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_eltbx_xray_scattering_ext")
+ext = bp.import_ext("cctbx_eltbx_xray_scattering_ext")
 from cctbx_eltbx_xray_scattering_ext import *
 
 import sys
@@ -25,10 +25,10 @@ def get_element_and_charge_symbols(scattering_type, exact=True):
     return sl[:-2], sl[-2:]
   return sl, ""
 
-boost_adaptbx.python.inject(ext.it1992_iterator, boost_adaptbx.python.py3_make_iterator)
-boost_adaptbx.python.inject(ext.wk1995_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.it1992_iterator, bp.py3_make_iterator)
+bp.inject(ext.wk1995_iterator, bp.py3_make_iterator)
 
-@boost_adaptbx.python.inject_into(ext.gaussian)
+@bp.inject_into(ext.gaussian)
 class _():
 
   def show(self, f=None, format=None):
diff --git a/cctbx/euclidean_model_matching.py b/cctbx/euclidean_model_matching.py
index 10a244e204..40d8784bc1 100644
--- a/cctbx/euclidean_model_matching.py
+++ b/cctbx/euclidean_model_matching.py
@@ -10,10 +10,10 @@
 from libtbx import adopt_init_args
 import sys, math
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_emma_ext")
+ext = bp.import_ext("cctbx_emma_ext")
 
 def sgtbx_rt_mx_as_matrix_rt(s):
   return matrix.rt((s.r().as_double(), s.t().as_double()))
diff --git a/cctbx/examples/merging/__init__.py b/cctbx/examples/merging/__init__.py
index a20c12b47f..6d41e67169 100644
--- a/cctbx/examples/merging/__init__.py
+++ b/cctbx/examples/merging/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.examples import bevington # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_large_scale_merging_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_large_scale_merging_ext")
 from cctbx_large_scale_merging_ext import *
diff --git a/cctbx/geometry/__init__.py b/cctbx/geometry/__init__.py
index 118eef90c9..1020cd0f87 100644
--- a/cctbx/geometry/__init__.py
+++ b/cctbx/geometry/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("cctbx_geometry_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("cctbx_geometry_ext")
 from cctbx_geometry_ext import *
diff --git a/cctbx/geometry_restraints/__init__.py b/cctbx/geometry_restraints/__init__.py
index 37ab7e350f..f0b882fab5 100644
--- a/cctbx/geometry_restraints/__init__.py
+++ b/cctbx/geometry_restraints/__init__.py
@@ -6,10 +6,10 @@
 from libtbx.test_utils import approx_equal
 from libtbx.str_utils import show_string
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_geometry_restraints_ext")
+ext = bp.import_ext("cctbx_geometry_restraints_ext")
 from cctbx_geometry_restraints_ext import *
 
 import scitbx.stl.map
@@ -37,7 +37,7 @@ def angle_delta_deg(angle_1, angle_2, periodicity=1):
   elif (d >  half_period): d -= 2*half_period
   return d
 
-@boost_adaptbx.python.inject_into(bond_params_table)
+@bp.inject_into(bond_params_table)
 class _():
 
   def lookup(self, i_seq, j_seq):
@@ -425,7 +425,7 @@ def process(self, source_info, proxy, tolerance=1.e-6):
         self.counts[i_list] += 1 # mark somewhere that this is duplicated
     return result
 
-@boost_adaptbx.python.inject_into(prolsq_repulsion_function)
+@bp.inject_into(prolsq_repulsion_function)
 class _():
 
   def customized_copy(O, c_rep=None, k_rep=None, irexp=None, rexp=None):
@@ -492,7 +492,7 @@ def _bond_show_sorted_impl(self,
   if (n_not_shown != 0):
     print(prefix + "... (remaining %d not shown)" % n_not_shown, file=f)
 
-@boost_adaptbx.python.inject_into(shared_bond_asu_proxy)
+@bp.inject_into(shared_bond_asu_proxy)
 class _():
 
   def get_proxies_without_origin_id(self, origin_id):
@@ -508,7 +508,7 @@ def resid_to_pymol(resid):
     resid = '\\' + resid
   return resid
 
-@boost_adaptbx.python.inject_into(shared_bond_simple_proxy)
+@bp.inject_into(shared_bond_simple_proxy)
 class _():
 
   def _generate_proxy_and_atom_labels(self, pdb_hierarchy):
@@ -680,7 +680,7 @@ def get_proxies_without_origin_id(self, origin_id):
         result.append(p)
     return result
 
-@boost_adaptbx.python.inject_into(bond_sorted_asu_proxies)
+@bp.inject_into(bond_sorted_asu_proxies)
 class _():
 
   def show_histogram_of_model_distances(self,
@@ -923,7 +923,7 @@ def show_sorted(self,
                           max_items=max_items,
                           origin_id=origin_id)
 
-@boost_adaptbx.python.inject_into(nonbonded_sorted_asu_proxies)
+@bp.inject_into(nonbonded_sorted_asu_proxies)
 class _():
 
   def deltas(self, sites_cart):
@@ -1127,7 +1127,7 @@ def suppress():
     if (n_not_shown != 0):
       print(prefix + "... (remaining %d not shown)" % n_not_shown, file=f)
 
-@boost_adaptbx.python.inject_into(angle)
+@bp.inject_into(angle)
 class _():
 
   def _show_sorted_item(O, f, prefix):
@@ -1142,7 +1142,7 @@ def _get_sorted_item(O):
     return [O.angle_ideal, O.angle_model, O.delta,
             weight_as_sigma(weight=O.weight), O.weight, O.residual()]
 
-@boost_adaptbx.python.inject_into(shared_angle_proxy)
+@bp.inject_into(shared_angle_proxy)
 class _():
 
   def as_pymol_dashes(self, pdb_hierarchy):
@@ -1259,7 +1259,7 @@ def get_outliers(self, sites_cart, sigma_threshold):
         result.append([i,j,k])
     return result
 
-@boost_adaptbx.python.inject_into(dihedral)
+@bp.inject_into(dihedral)
 class _():
 
   def _show_sorted_item(O, f, prefix):
@@ -1277,7 +1277,7 @@ def _get_sorted_item(O):
     return [O.angle_ideal, O.angle_model, O.delta, O.periodicity,
             weight_as_sigma(weight=O.weight), O.weight, O.residual()]
 
-@boost_adaptbx.python.inject_into(shared_dihedral_proxy)
+@bp.inject_into(shared_dihedral_proxy)
 class _():
 
   def deltas(self, sites_cart, unit_cell=None):
@@ -1350,7 +1350,7 @@ def get_outliers(self, sites_cart, sigma_threshold):
         result.append(ind)
     return result
 
-@boost_adaptbx.python.inject_into(chirality)
+@bp.inject_into(chirality)
 class _():
 
   def _show_sorted_item(O, f, prefix):
@@ -1365,7 +1365,7 @@ def _get_sorted_item(O):
     return [str(O.both_signs), O.volume_ideal, O.volume_model, O.delta,
       weight_as_sigma(weight=O.weight), O.weight, O.residual()]
 
-@boost_adaptbx.python.inject_into(shared_chirality_proxy)
+@bp.inject_into(shared_chirality_proxy)
 class _():
 
   def deltas(self, sites_cart, unit_cell=None):
@@ -1434,7 +1434,7 @@ def get_outliers(self, sites_cart, sigma_threshold):
         result.append(ind)
     return result
 
-@boost_adaptbx.python.inject_into(shared_planarity_proxy)
+@bp.inject_into(shared_planarity_proxy)
 class _():
 
   def deltas_rms(O, sites_cart, unit_cell=None):
@@ -1588,7 +1588,7 @@ def show_sorted(O,
       print("%sSorted by %s:" % (prefix, by_value), file=f)
       print(outl[:-1], file=f)
 
-@boost_adaptbx.python.inject_into(parallelity)
+@bp.inject_into(parallelity)
 class _():
 
   def _show_sorted_item(O, f, prefix):
@@ -1599,7 +1599,7 @@ def _show_sorted_item(O, f, prefix):
   def _get_sorted_item(self):
     return [self.residual(), self.weight, self.delta]
 
-@boost_adaptbx.python.inject_into(shared_parallelity_proxy)
+@bp.inject_into(shared_parallelity_proxy)
 class _():
 
   def deltas(O, sites_cart, unit_cell=None):
@@ -1675,7 +1675,7 @@ def get_sorted(self,
         get_restraints_only=False,
         origin_id=origin_id)
 
-@boost_adaptbx.python.inject_into(shared_bond_similarity_proxy)
+@bp.inject_into(shared_bond_similarity_proxy)
 class _():
 
   def deltas_rms(self, sites_cart, unit_cell=None):
@@ -1987,7 +1987,7 @@ def __init__(self,
         min_cubicle_edge=min_cubicle_edge,
         shell_asu_tables=shell_asu_tables)
 
-@boost_adaptbx.python.inject_into(ext.motif)
+@bp.inject_into(ext.motif)
 class _():
 
   def show(self, out=None, prefix=""):
@@ -2099,7 +2099,7 @@ def show_planarities(self, out=None, prefix=""):
           print(prefix+"  atom = %s %.6g" % (show_string(an), w), file=out)
         print(prefix+"}", file=out)
 
-@boost_adaptbx.python.inject_into(ext.motif_alteration)
+@bp.inject_into(ext.motif_alteration)
 class _():
 
   def show(self, out=None, prefix="", previous_help=None):
@@ -2312,7 +2312,7 @@ def show(self, out=None, prefix="", previous_help=None):
       raise RuntimeError("Internal Error: unknown operand: %s" % operand)
     return help
 
-@boost_adaptbx.python.inject_into(ext.motif_manipulation)
+@bp.inject_into(ext.motif_manipulation)
 class _():
 
   def show(self, out=None, prefix=""):
diff --git a/cctbx/geometry_restraints/energies.py b/cctbx/geometry_restraints/energies.py
index 0aa355107f..e0a35ada7f 100644
--- a/cctbx/geometry_restraints/energies.py
+++ b/cctbx/geometry_restraints/energies.py
@@ -160,8 +160,8 @@ def __init__(self, sites_cart,
       self.n_reference_coordinate_proxies = None
       self.reference_coordinate_residual_sum = 0
     else:
-      import boost_adaptbx.python
-      ext = boost_adaptbx.python.import_ext("mmtbx_reference_coordinate_ext")
+      import boost_adaptbx.boost.python as bp
+      ext = bp.import_ext("mmtbx_reference_coordinate_ext")
       self.n_reference_coordinate_proxies = reference_coordinate_proxies.size()
       self.reference_coordinate_residual_sum = \
           ext.reference_coordinate_residual_sum(
diff --git a/cctbx/geometry_restraints/manager.py b/cctbx/geometry_restraints/manager.py
index b08b0db4ff..cc95a76e9a 100644
--- a/cctbx/geometry_restraints/manager.py
+++ b/cctbx/geometry_restraints/manager.py
@@ -13,10 +13,10 @@
 from six import StringIO
 import iotbx.pdb
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-boost_adaptbx.python.import_ext("scitbx_array_family_flex_ext")
+bp.import_ext("scitbx_array_family_flex_ext")
 from scitbx_array_family_flex_ext import reindexing_array
 
 from cctbx.geometry_restraints.linking_class import linking_class
diff --git a/cctbx/maptbx/__init__.py b/cctbx/maptbx/__init__.py
index e3d649b53e..22f97f710a 100644
--- a/cctbx/maptbx/__init__.py
+++ b/cctbx/maptbx/__init__.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.sgtbx
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
+ext = bp.import_ext("cctbx_maptbx_ext")
 from cctbx_maptbx_ext import *
 
 from cctbx import crystal
@@ -28,7 +28,7 @@
 debug_peak_cluster_analysis = os.environ.get(
   "CCTBX_MAPTBX_DEBUG_PEAK_CLUSTER_ANALYSIS", "")
 
-@boost_adaptbx.python.inject_into(connectivity)
+@bp.inject_into(connectivity)
 class _():
 
   def get_blobs_boundaries_tuples(self):
@@ -310,7 +310,7 @@ class statistics(ext.statistics):
   def __init__(self, map):
     ext.statistics.__init__(self, map)
 
-@boost_adaptbx.python.inject_into(ext.statistics)
+@bp.inject_into(ext.statistics)
 class _():
 
   def show_summary(self, f = None, prefix = ""):
@@ -323,7 +323,7 @@ def show_summary(self, f = None, prefix = ""):
 use_space_group_symmetry = sgtbx.search_symmetry_flags(
   use_space_group_symmetry = True)
 
-@boost_adaptbx.python.inject_into(ext.histogram)
+@bp.inject_into(ext.histogram)
 class _():
 
   """
diff --git a/cctbx/maptbx/tst_asymmetric_map.py b/cctbx/maptbx/tst_asymmetric_map.py
index caa866d621..16337bbe56 100644
--- a/cctbx/maptbx/tst_asymmetric_map.py
+++ b/cctbx/maptbx/tst_asymmetric_map.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.development import random_structure
 from cctbx.sgtbx import space_group_info
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from cctbx_asymmetric_map_ext import *
 from cctbx.array_family import flex
 from cctbx import maptbx
diff --git a/cctbx/maptbx/tst_interpolation_2.py b/cctbx/maptbx/tst_interpolation_2.py
index 055a84bc67..d5e021386f 100644
--- a/cctbx/maptbx/tst_interpolation_2.py
+++ b/cctbx/maptbx/tst_interpolation_2.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.development import random_structure
 from cctbx.sgtbx import space_group_info
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from cctbx_asymmetric_map_ext import *
 from cctbx.array_family import flex
 from cctbx import miller
diff --git a/cctbx/masks/__init__.py b/cctbx/masks/__init__.py
index 76f6d0524c..7c430d2635 100644
--- a/cctbx/masks/__init__.py
+++ b/cctbx/masks/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from functools import reduce
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_masks_ext")
+ext = bp.import_ext("cctbx_masks_ext")
 from cctbx_masks_ext import *
 
 import sys
@@ -47,7 +47,7 @@ def show(self, log=None):
     print(" ".join("%5.2f" %self.table[symbol] for symbol in symbols), file=log)
 
 
-@boost_adaptbx.python.inject_into(flood_fill)
+@bp.inject_into(flood_fill)
 class _():
 
   def eigensystems_frac(self):
diff --git a/cctbx/math_module.py b/cctbx/math_module.py
index 8ba2f87419..e90eb9d5d3 100644
--- a/cctbx/math_module.py
+++ b/cctbx/math_module.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_math_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_math_ext")
 from cctbx_math_ext import *
 
 def basis_of_mirror_plane_with_normal(u):
diff --git a/cctbx/merging/__init__.py b/cctbx/merging/__init__.py
index 7e83d3e5d6..ad66cd4762 100644
--- a/cctbx/merging/__init__.py
+++ b/cctbx/merging/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("cctbx_merging_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("cctbx_merging_ext")
 from cctbx_merging_ext import *
diff --git a/cctbx/miller/__init__.py b/cctbx/miller/__init__.py
index 56fd5e8e9a..bf1f903892 100644
--- a/cctbx/miller/__init__.py
+++ b/cctbx/miller/__init__.py
@@ -2,11 +2,11 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.sgtbx
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_miller_ext")
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+ext = bp.import_ext("cctbx_miller_ext")
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from cctbx_miller_ext import *
 
 from cctbx import crystal
diff --git a/cctbx/multipolar.py b/cctbx/multipolar.py
index 3d50f228d3..7e60f58c59 100644
--- a/cctbx/multipolar.py
+++ b/cctbx/multipolar.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex # for tuple mappings
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_multipolar_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_multipolar_ext")
 from cctbx_multipolar_ext import *
-
diff --git a/cctbx/regression/tst_direct_space_asu.py b/cctbx/regression/tst_direct_space_asu.py
index b24fd466c9..52ae3085d8 100644
--- a/cctbx/regression/tst_direct_space_asu.py
+++ b/cctbx/regression/tst_direct_space_asu.py
@@ -11,7 +11,7 @@
 from scitbx import matrix
 from libtbx.test_utils import approx_equal
 from libtbx.utils import format_cpu_times
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 import random
 import copy
 import sys
diff --git a/cctbx/regression/tst_french_wilson.py b/cctbx/regression/tst_french_wilson.py
index 405ff76e43..8ffa445511 100644
--- a/cctbx/regression/tst_french_wilson.py
+++ b/cctbx/regression/tst_french_wilson.py
@@ -2,9 +2,9 @@
 from cctbx import french_wilson
 from cctbx.development import random_structure
 from scitbx.array_family import flex
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-fw_ext = boost_adaptbx.python.import_ext("cctbx_french_wilson_ext")
+fw_ext = bp.import_ext("cctbx_french_wilson_ext")
 from libtbx.utils import null_out, Sorry
 from libtbx.test_utils import Exception_expected
 import random
diff --git a/cctbx/regression/tst_map_weights_for_symmetry_summation.py b/cctbx/regression/tst_map_weights_for_symmetry_summation.py
index 0720bf8254..805ab1d325 100644
--- a/cctbx/regression/tst_map_weights_for_symmetry_summation.py
+++ b/cctbx/regression/tst_map_weights_for_symmetry_summation.py
@@ -17,7 +17,7 @@
 from libtbx.math_utils import iround
 from libtbx.test_utils import approx_equal
 from libtbx.utils import n_dim_index_from_one_dim
-import boost_adaptbx.rational
+import boost_adaptbx.boost.rational
 import random
 from six.moves import zip
 
@@ -45,7 +45,7 @@ def exercise(space_group_info, redundancy_counter=0):
         original_site=xyz,
         min_distance_sym_equiv=1e-5)
       m = space_group_info.group().multiplicity(
-        site=boost_adaptbx.rational.vector(ijk, n_real))
+        site=boost_adaptbx.boost.rational.vector(ijk, n_real))
       assert m == ss.multiplicity()
       w = m / order_z
       weight_map[ijk] = w
diff --git a/cctbx/regression/tst_miller.py b/cctbx/regression/tst_miller.py
index f4f2c64668..9b8de4b287 100644
--- a/cctbx/regression/tst_miller.py
+++ b/cctbx/regression/tst_miller.py
@@ -2532,8 +2532,8 @@ def exercise_karle_normalization():
   assert cntr == 2
 
 def exercise_structure_factors_from_map_and_asu_map(d_min=2.):
-  import boost_adaptbx.python
-  asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+  import boost_adaptbx.boost.python as bp
+  asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
   def rfactor(x,y):
     x = flex.abs(x.data())
     y = flex.abs(y.data())
diff --git a/cctbx/sgtbx/__init__.py b/cctbx/sgtbx/__init__.py
index 87969cdd0b..d7d9078dd9 100644
--- a/cctbx/sgtbx/__init__.py
+++ b/cctbx/sgtbx/__init__.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 from cctbx import uctbx
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_sgtbx_ext")
+ext = bp.import_ext("cctbx_sgtbx_ext")
 from cctbx_sgtbx_ext import *
 
 import libtbx
@@ -22,11 +22,11 @@ class empty: pass
 
 from cctbx.array_family import flex
 from scitbx import matrix
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 import random
 import sys
 
-boost_adaptbx.python.inject(ext.space_group_symbol_iterator, boost_adaptbx.python.py3_make_iterator)
+bp.inject(ext.space_group_symbol_iterator, bp.py3_make_iterator)
 
 def vec3_rat_from_str(s):
   flds = s.split(",")
@@ -42,7 +42,7 @@ def vec3_rat_from_str(s):
     result.append(rational.int(n, d))
   return result
 
-@boost_adaptbx.python.inject_into(ext.space_group)
+@bp.inject_into(ext.space_group)
 class _():
 
   def smx(self, with_inversion=False):
@@ -415,7 +415,7 @@ def reference_space_group_infos():
   for number in range(1,230+1):
     yield space_group_info(number=number)
 
-@boost_adaptbx.python.inject_into(tr_vec)
+@bp.inject_into(tr_vec)
 class _():
 
   def as_rational(self):
@@ -437,7 +437,7 @@ def __init__(self, reduced_cell, rot_mx, deg=False):
     else:
       self.delta = self.t.accute_angle(self.tau, deg=deg)
 
-@boost_adaptbx.python.inject_into(rot_mx)
+@bp.inject_into(rot_mx)
 class _():
 
   def as_rational(self):
@@ -459,7 +459,7 @@ def lebedev_2005_perturbation(self, reduced_cell):
     return ((sirms * sirms).trace() / 12)**0.5
 
 
-@boost_adaptbx.python.inject_into(rot_mx_info)
+@bp.inject_into(rot_mx_info)
 class _():
 
   def basis_of_invariant(self):
@@ -482,7 +482,7 @@ def __str__(self):
     result += " |(%i, %i, %i)" % self.ev()
     return result
 
-@boost_adaptbx.python.inject_into(translation_part_info)
+@bp.inject_into(translation_part_info)
 class _():
 
   def __str__(self):
@@ -492,7 +492,7 @@ def __str__(self):
     return result
 
 
-@boost_adaptbx.python.inject_into(ext.rt_mx)
+@bp.inject_into(ext.rt_mx)
 class _():
 
   def __getinitargs__(self):
@@ -518,7 +518,7 @@ def show_geometrical_elements(self, out=None):
     t_info = translation_part_info(self)
     print("%s %s" % (r_info, t_info), file=out)
 
-@boost_adaptbx.python.inject_into(ext.search_symmetry_flags)
+@bp.inject_into(ext.search_symmetry_flags)
 class _():
 
   def show_summary(self, f=None):
@@ -625,7 +625,7 @@ def special_op_simplifier(special_op):
         [i_row], [m], t[j_row] - m*t[i_row])
   return special_op_simplified(terms=terms)
 
-@boost_adaptbx.python.inject_into(ext.site_symmetry_ops)
+@bp.inject_into(ext.site_symmetry_ops)
 class _():
 
   def __getinitargs__(self):
@@ -639,7 +639,7 @@ def shelx_fvar_encoding(self, fvars, site, p_tolerance=1e-5):
     return fvar_encoding.site_constraints_site_symmetry_ops(
       O=self, fvars=fvars, site=site, p_tolerance=p_tolerance)
 
-@boost_adaptbx.python.inject_into(ext.site_symmetry_table)
+@bp.inject_into(ext.site_symmetry_table)
 class _():
 
   def __getinitargs__(self):
@@ -746,13 +746,13 @@ def pack_gradients(self, g_frac):
       for _ in g: result.append(_)
     return result
 
-@boost_adaptbx.python.inject_into(wyckoff_position)
+@bp.inject_into(wyckoff_position)
 class _():
 
   def special_op_simplified(self):
     return special_op_simplifier(special_op=self.special_op())
 
-@boost_adaptbx.python.inject_into(wyckoff_table)
+@bp.inject_into(wyckoff_table)
 class _():
 
   def random_site_symmetry(self,
@@ -773,7 +773,7 @@ def random_site_symmetry(self,
         assert site_symmetry.multiplicity() == position.multiplicity()
         return site_symmetry
 
-@boost_adaptbx.python.inject_into(structure_seminvariants)
+@bp.inject_into(structure_seminvariants)
 class _():
 
   def __str__(self):
diff --git a/cctbx/sgtbx/direct_space_asu/check_redundancies.py b/cctbx/sgtbx/direct_space_asu/check_redundancies.py
index 205d1ee42e..c8dda7e8fb 100644
--- a/cctbx/sgtbx/direct_space_asu/check_redundancies.py
+++ b/cctbx/sgtbx/direct_space_asu/check_redundancies.py
@@ -6,7 +6,7 @@
 from scitbx.python_utils import dicts
 from scitbx.python_utils import command_line
 from libtbx import easy_run
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 import sys, os
 from libtbx.math_utils import cmp
 from six.moves import range
diff --git a/cctbx/sgtbx/direct_space_asu/cut_plane.py b/cctbx/sgtbx/direct_space_asu/cut_plane.py
index a182949111..d6ae8dca08 100644
--- a/cctbx/sgtbx/direct_space_asu/cut_plane.py
+++ b/cctbx/sgtbx/direct_space_asu/cut_plane.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 from libtbx import slots_getstate_setstate
 from scitbx import matrix
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 import string
 from six.moves import range
 from six.moves import zip
diff --git a/cctbx/sgtbx/direct_space_asu/facet_analysis.py b/cctbx/sgtbx/direct_space_asu/facet_analysis.py
index eb5f8afa54..44e03fdb95 100644
--- a/cctbx/sgtbx/direct_space_asu/facet_analysis.py
+++ b/cctbx/sgtbx/direct_space_asu/facet_analysis.py
@@ -3,7 +3,7 @@
 from cctbx.array_family import flex
 from scitbx import matrix
 import scitbx.math
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from six.moves import range
 from six.moves import zip
 
diff --git a/cctbx/sgtbx/direct_space_asu/proto/__init__.py b/cctbx/sgtbx/direct_space_asu/proto/__init__.py
index 5c462c1047..1c3e3c5371 100644
--- a/cctbx/sgtbx/direct_space_asu/proto/__init__.py
+++ b/cctbx/sgtbx/direct_space_asu/proto/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import sys
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_sgtbx_asu_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_sgtbx_asu_ext")
 from cctbx_sgtbx_asu_ext import *
 
 def asu_show_(asu, f=None):
diff --git a/cctbx/sgtbx/direct_space_asu/proto/tst_asu.py b/cctbx/sgtbx/direct_space_asu/proto/tst_asu.py
index 3013cc5080..188ddcd39a 100644
--- a/cctbx/sgtbx/direct_space_asu/proto/tst_asu.py
+++ b/cctbx/sgtbx/direct_space_asu/proto/tst_asu.py
@@ -2,7 +2,7 @@
 import sys
 from six.moves import cStringIO as StringIO
 import cctbx
-from boost_adaptbx.rational import int as rint
+from boost_adaptbx.boost.rational import int as rint
 from cctbx.sgtbx import space_group_info
 from cctbx.sgtbx.direct_space_asu import proto as new_asu
 from cctbx.crystal import direct_space_asu_float_asu
@@ -235,4 +235,3 @@ def run():
       print(log)
       print(">>>>>>>> End Log")
     raise
-
diff --git a/cctbx/sgtbx/direct_space_asu/short_cuts.py b/cctbx/sgtbx/direct_space_asu/short_cuts.py
index 703888b935..64be35fa81 100644
--- a/cctbx/sgtbx/direct_space_asu/short_cuts.py
+++ b/cctbx/sgtbx/direct_space_asu/short_cuts.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.sgtbx.direct_space_asu.cut_plane import cut
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 
 r1 = rational.int(1)
 
diff --git a/cctbx/sgtbx/harker.py b/cctbx/sgtbx/harker.py
index 20a1d3f069..f4ecdf432a 100644
--- a/cctbx/sgtbx/harker.py
+++ b/cctbx/sgtbx/harker.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 from cctbx import crystal
 from cctbx import sgtbx
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 import math
 import sys
 from six.moves import range
diff --git a/cctbx/sgtbx/rational_matrices_point_groups.py b/cctbx/sgtbx/rational_matrices_point_groups.py
index 47764c9137..5e646e0eb3 100644
--- a/cctbx/sgtbx/rational_matrices_point_groups.py
+++ b/cctbx/sgtbx/rational_matrices_point_groups.py
@@ -2,7 +2,7 @@
 from cctbx import sgtbx
 from cctbx.sgtbx import sub_lattice_tools
 from scitbx import matrix
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from libtbx.math_utils import ifloor
 from six.moves import zip
 
diff --git a/cctbx/sgtbx/reticular_pg_tools.py b/cctbx/sgtbx/reticular_pg_tools.py
index 45c85247b4..3c0d3ff033 100644
--- a/cctbx/sgtbx/reticular_pg_tools.py
+++ b/cctbx/sgtbx/reticular_pg_tools.py
@@ -12,7 +12,7 @@
 from cctbx import sgtbx
 from cctbx.sgtbx import cosets, sub_lattice_tools
 from scitbx import matrix
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from libtbx.math_utils import ifloor
 from six.moves import zip
 
diff --git a/cctbx/sgtbx/sub_lattice_tools.py b/cctbx/sgtbx/sub_lattice_tools.py
index d51804a7a5..a9f68b5e73 100644
--- a/cctbx/sgtbx/sub_lattice_tools.py
+++ b/cctbx/sgtbx/sub_lattice_tools.py
@@ -9,7 +9,7 @@
 import scitbx.math
 from libtbx.test_utils import approx_equal
 from libtbx.utils import format_cpu_times
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from libtbx.math_utils import ifloor
 from six.moves import cStringIO as StringIO
 from six.moves import range
diff --git a/cctbx/statistics.py b/cctbx/statistics.py
index 564bacd56f..42028787f4 100644
--- a/cctbx/statistics.py
+++ b/cctbx/statistics.py
@@ -6,9 +6,9 @@
 from libtbx.utils import plural_s
 import math
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_statistics_ext")
+ext = bp.import_ext("cctbx_statistics_ext")
 from cctbx_statistics_ext import *
 
 mean_number_of_atoms_per_amino_acid = {'C': 5, 'N': 3, 'O': 1}
diff --git a/cctbx/symmetry_search.py b/cctbx/symmetry_search.py
index f3c059ea42..0683d5d86e 100644
--- a/cctbx/symmetry_search.py
+++ b/cctbx/symmetry_search.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_symmetry_search_ext")
+ext = bp.import_ext("cctbx_symmetry_search_ext")
 from cctbx_symmetry_search_ext import ls_with_scale_and_bias
 
 from cctbx import miller
diff --git a/cctbx/translation_search.py b/cctbx/translation_search.py
index 19fdfea166..3506475ab7 100644
--- a/cctbx/translation_search.py
+++ b/cctbx/translation_search.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.maptbx # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("cctbx_translation_search_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("cctbx_translation_search_ext")
 from cctbx_translation_search_ext import *
diff --git a/cctbx/uctbx/__init__.py b/cctbx/uctbx/__init__.py
index c1dfe4b14e..c3cc23f48c 100644
--- a/cctbx/uctbx/__init__.py
+++ b/cctbx/uctbx/__init__.py
@@ -2,9 +2,9 @@
 import cctbx.array_family.flex # import dependency
 import scitbx.array_family.shared # import dependency
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_uctbx_ext")
+ext = bp.import_ext("cctbx_uctbx_ext")
 from cctbx_uctbx_ext import *
 
 from scitbx import matrix
@@ -116,7 +116,7 @@ def update_docstring(obj, string):
 :rtype: 3-tuple or flex.vec3_double
 """)
 
-@boost_adaptbx.python.inject_into(ext.unit_cell)
+@bp.inject_into(ext.unit_cell)
 class _():
 
   def __str__(self):
diff --git a/cctbx/uctbx/determine_unit_cell/__init__.py b/cctbx/uctbx/determine_unit_cell/__init__.py
index 8d0c2fe0e4..5e057e643d 100644
--- a/cctbx/uctbx/determine_unit_cell/__init__.py
+++ b/cctbx/uctbx/determine_unit_cell/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 try:
-    boost_adaptbx.python.import_ext("determine_unit_cell_ext")
+    bp.import_ext("determine_unit_cell_ext")
 except ImportError:
     print("Cannot import the boost-bound NCDist module. Are you sure that NCDist.h is in the source tree, and that you have rebuilt?")
 from determine_unit_cell_ext import *
diff --git a/cctbx/web/change_basis.py b/cctbx/web/change_basis.py
index ce30122833..b8b398c520 100644
--- a/cctbx/web/change_basis.py
+++ b/cctbx/web/change_basis.py
@@ -3,7 +3,7 @@
 def number_from_string(s):
   flds = s.split("/")
   if (len(flds) == 2):
-    from boost_adaptbx.rational import int as rint
+    from boost_adaptbx.boost.rational import int as rint
     return rint(int(flds[0]), int(flds[1]))
   return (eval(s)+0)*1
 
diff --git a/cctbx/xray/ext.py b/cctbx/xray/ext.py
index 487042c83d..7eac62c470 100644
--- a/cctbx/xray/ext.py
+++ b/cctbx/xray/ext.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("cctbx_xray_ext")
+ext = bp.import_ext("cctbx_xray_ext")
 from cctbx_xray_ext import *
 
 from cctbx.array_family import flex
 import sys
 
-@boost_adaptbx.python.inject_into(scattering_type_registry)
+@bp.inject_into(scattering_type_registry)
 class _():
 
   def type_count_dict(self):
@@ -122,7 +122,7 @@ def as_type_gaussian_dict(self):
       result[t] = ugs[i]
     return result
 
-@boost_adaptbx.python.inject_into(sampled_model_density)
+@bp.inject_into(sampled_model_density)
 class _():
 
   def real_map_unpadded(self):
diff --git a/cctbx/xray/scatterer.py b/cctbx/xray/scatterer.py
index abd949335e..eee982e560 100644
--- a/cctbx/xray/scatterer.py
+++ b/cctbx/xray/scatterer.py
@@ -5,7 +5,7 @@
 from cctbx import adptbx
 from cctbx.array_family import flex
 from libtbx.str_utils import show_string
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import cStringIO as StringIO
 import sys
 
@@ -28,7 +28,7 @@ def __init__(self, label="",
     ext.scatterer.__init__(
       self, label, site, u, occupancy, scattering_type, fp, fdp)
 
-@boost_adaptbx.python.inject_into(ext.scatterer)
+@bp.inject_into(ext.scatterer)
 class _():
 
   def customized_copy(self,
diff --git a/cctbx/xray/structure_factors/from_scatterers_direct_parallel.py b/cctbx/xray/structure_factors/from_scatterers_direct_parallel.py
index 6d0570eb4f..221afe6fe1 100644
--- a/cctbx/xray/structure_factors/from_scatterers_direct_parallel.py
+++ b/cctbx/xray/structure_factors/from_scatterers_direct_parallel.py
@@ -31,7 +31,7 @@ class pprocess:
           make install
 
     3. gcc 4.4.2 or higher is required for Linux build of pycuda 2011.1
-    4. boost_adaptbx.python is required for pycuda; cctbx-installed version is probably OK, not tested.
+    4. boost_adaptbx.boost.python is required for pycuda; cctbx-installed version is probably OK, not tested.
        tests were performed with separately-installed boost::
 
           cd boost_1_45_0
diff --git a/cctbx/xray/structure_factors/gradient_flags.py b/cctbx/xray/structure_factors/gradient_flags.py
index 89a90cf09b..a5e2e4db1f 100644
--- a/cctbx/xray/structure_factors/gradient_flags.py
+++ b/cctbx/xray/structure_factors/gradient_flags.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.xray import ext
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 
 class gradient_flags(ext.gradient_flags):
@@ -26,7 +26,7 @@ def __init__(self, site=None,
     ext.gradient_flags.__init__(self,
       site, u_iso, u_aniso, occupancy, fp, fdp, sqrt_u_iso, tan_b_iso_max)
 
-@boost_adaptbx.python.inject_into(ext.gradient_flags)
+@bp.inject_into(ext.gradient_flags)
 class _():
 
   def copy(self):
diff --git a/clipper_adaptbx/clipper/__init__.py b/clipper_adaptbx/clipper/__init__.py
index e811a6fb7e..10ad1e4d5d 100644
--- a/clipper_adaptbx/clipper/__init__.py
+++ b/clipper_adaptbx/clipper/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("clipper_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("clipper_ext")
 from clipper_ext import *
diff --git a/cma_es/__init__.py b/cma_es/__init__.py
index 9eb5726926..57dc82f4a1 100644
--- a/cma_es/__init__.py
+++ b/cma_es/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-cma_es_ext = boost_adaptbx.python.import_ext("cma_es_ext")
+import boost_adaptbx.boost.python as bp
+cma_es_ext = bp.import_ext("cma_es_ext")
 from cma_es_ext import *
diff --git a/crys3d/qttbx/__init__.py b/crys3d/qttbx/__init__.py
index 2e336c66ca..fc1c2f9677 100644
--- a/crys3d/qttbx/__init__.py
+++ b/crys3d/qttbx/__init__.py
@@ -14,7 +14,7 @@
 class widget_with_fp_exception_trapping_off_mixin(object):
 
   def show(self):
-    from boost_adaptbx.python import ext
+    from boost_adaptbx.boost.python import ext
     try:
       division_by_zero = ext.is_division_by_zero_trapped()
       invalid = ext.is_invalid_trapped()
diff --git a/cudatbx/__init__.py b/cudatbx/__init__.py
index 6581b1c9ba..517084e2b7 100644
--- a/cudatbx/__init__.py
+++ b/cudatbx/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import libtbx.load_env
 if (libtbx.env.build_options.enable_cuda):
-  cudatbx_ext = boost_adaptbx.python.import_ext("cudatbx_ext")
+  cudatbx_ext = bp.import_ext("cudatbx_ext")
   from cudatbx_ext import *
diff --git a/cudatbx/cufft/__init__.py b/cudatbx/cufft/__init__.py
index 110a05f30e..4ffe0a2b6a 100644
--- a/cudatbx/cufft/__init__.py
+++ b/cudatbx/cufft/__init__.py
@@ -3,8 +3,8 @@
 import atexit
 
 def real_to_complex_3d_in_place(data):
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("cudatbx_cufft_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("cudatbx_cufft_ext")
   real_type = type(data).__name__
   if (real_type == "double"):
     return ext.real_to_complex_3d_in_place_dp(data)
@@ -13,8 +13,8 @@ def real_to_complex_3d_in_place(data):
     return ext.real_to_complex_3d_in_place_sp(data)
 
 def complex_to_complex_3d_in_place(data, direction):
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("cudatbx_cufft_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("cudatbx_cufft_ext")
   complex_type = type(data).__name__
   if (complex_type == "complex_double"):
     return ext.complex_to_complex_3d_in_place_dp(data, direction)
@@ -23,8 +23,8 @@ def complex_to_complex_3d_in_place(data, direction):
     return ext.complex_to_complex_3d_in_place_sp(data, direction)
 
 def complex_to_real_3d_in_place(data, n):
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("cudatbx_cufft_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("cudatbx_cufft_ext")
   complex_type = type(data).__name__
   if (complex_type == "complex_double"):
     return ext.complex_to_real_3d_in_place_dp(data, n)
@@ -33,8 +33,8 @@ def complex_to_real_3d_in_place(data, n):
     return ext.complex_to_real_3d_in_place_sp(data, n)
 
 def clean_up():
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("cudatbx_cufft_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("cudatbx_cufft_ext")
   ext.clean_up()
 
 # scitbx.fftpack compatibility API
diff --git a/cudatbx/math/special_functions/__init__.py b/cudatbx/math/special_functions/__init__.py
index ad13e18d1b..4043198622 100644
--- a/cudatbx/math/special_functions/__init__.py
+++ b/cudatbx/math/special_functions/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import libtbx.load_env
 if (libtbx.env.build_options.enable_cuda):
-  cudatbx_special_functions_ext = boost_adaptbx.python.import_ext("cudatbx_special_functions_ext")
+  cudatbx_special_functions_ext = bp.import_ext("cudatbx_special_functions_ext")
   from cudatbx_special_functions_ext import *
diff --git a/cudatbx/scattering/__init__.py b/cudatbx/scattering/__init__.py
index 0bb7fe9b20..10d217842a 100644
--- a/cudatbx/scattering/__init__.py
+++ b/cudatbx/scattering/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import libtbx.load_env
 if (libtbx.env.build_options.enable_cuda):
-  cudatbx_scattering_ext = boost_adaptbx.python.import_ext("cudatbx_scattering_ext")
+  cudatbx_scattering_ext = bp.import_ext("cudatbx_scattering_ext")
   from cudatbx_scattering_ext import *
diff --git a/fable/__init__.py b/fable/__init__.py
index 16646e4dd8..04c9b69fc7 100644
--- a/fable/__init__.py
+++ b/fable/__init__.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 try:
-  import boost_adaptbx.python
+  import boost_adaptbx.boost.python as bp
 except Exception:
   ext = None
 else:
-  ext = boost_adaptbx.python.import_ext("fable_ext", optional=True)
+  ext = bp.import_ext("fable_ext", optional=True)
 from six.moves import range
 
 # compare with fem/utils/string.hpp
diff --git a/fast_linalg/__init__.py b/fast_linalg/__init__.py
index 9994fde25a..c6a6d08432 100644
--- a/fast_linalg/__init__.py
+++ b/fast_linalg/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import sys
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 try:
-  ext = boost_adaptbx.python.import_ext('fast_linalg_ext')
+  ext = bp.import_ext('fast_linalg_ext')
   env = ext.env
   try_to_initialise = True
 except ImportError:
diff --git a/fftw3tbx/__init__.py b/fftw3tbx/__init__.py
index 643dd6a927..a0116c04ba 100644
--- a/fftw3tbx/__init__.py
+++ b/fftw3tbx/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 try:
   import scitbx.array_family.flex # import dependency
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("fftw3tbx_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("fftw3tbx_ext")
 except ImportError:
   ext = None
 if (ext is not None):
diff --git a/gltbx/fonts.py b/gltbx/fonts.py
index 6325a67c15..06f2eb6141 100644
--- a/gltbx/fonts.py
+++ b/gltbx/fonts.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("gltbx_fonts_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("gltbx_fonts_ext")
 from gltbx_fonts_ext import *
 
 ucs_bitmap_8x13 = ucs_bitmap(short_name="8x13")
 ucs_bitmap_9x15 = ucs_bitmap(short_name="9x15")
 ucs_bitmap_10x20 = ucs_bitmap(short_name="10x20")
 
-@boost_adaptbx.python.inject_into(ucs_bitmap)
+@bp.inject_into(ucs_bitmap)
 class _():
 
   def render_text(self, position, text, relative_line_spacing=1.0,
diff --git a/gltbx/gl.py b/gltbx/gl.py
index ed802485c3..7b08cb2566 100644
--- a/gltbx/gl.py
+++ b/gltbx/gl.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("gltbx_gl_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("gltbx_gl_ext")
 from gltbx_gl_ext import *
 
 def __function_taking_transposed_matrix(f):
diff --git a/gltbx/glu.py b/gltbx/glu.py
index 874cba5791..a053956bb7 100644
--- a/gltbx/glu.py
+++ b/gltbx/glu.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("gltbx_glu_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("gltbx_glu_ext")
 from gltbx_glu_ext import *
diff --git a/gltbx/quadrics.py b/gltbx/quadrics.py
index 6e4dee6db1..375f10b79b 100644
--- a/gltbx/quadrics.py
+++ b/gltbx/quadrics.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("gltbx_quadrics_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("gltbx_quadrics_ext")
 from gltbx_quadrics_ext import *
diff --git a/gltbx/util.py b/gltbx/util.py
index b459d7d020..fbad71ba9c 100644
--- a/gltbx/util.py
+++ b/gltbx/util.py
@@ -2,9 +2,9 @@
 import scitbx.array_family.flex # import dependency
 import scitbx.matrix
 from libtbx import easy_run
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("gltbx_util_ext")
+ext = bp.import_ext("gltbx_util_ext")
 from gltbx_util_ext import *
 import re
 import sys
diff --git a/gltbx/viewer_utils.py b/gltbx/viewer_utils.py
index 7a59fbea33..c6ce23b339 100644
--- a/gltbx/viewer_utils.py
+++ b/gltbx/viewer_utils.py
@@ -2,8 +2,8 @@
 import scitbx.array_family.flex # import dependency
 import time
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("gltbx_viewer_utils_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("gltbx_viewer_utils_ext")
 from gltbx_viewer_utils_ext import *
 
 def read_pixels_to_str(x, y, width, height):
diff --git a/iotbx/ccp4_map/__init__.py b/iotbx/ccp4_map/__init__.py
index 4aaa2ad9aa..5c3e03aa89 100644
--- a/iotbx/ccp4_map/__init__.py
+++ b/iotbx/ccp4_map/__init__.py
@@ -2,8 +2,8 @@
 import cctbx.array_family.flex as flex# import dependency
 import sys
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_ccp4_map_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_ccp4_map_ext")
 from iotbx_ccp4_map_ext import *
 import iotbx_ccp4_map_ext as ext
 
@@ -161,8 +161,8 @@ def grid_unit_cell(self):
     alpha,beta,gamma = self.unit_cell_parameters[3:6]
     return uctbx.unit_cell((a,b,c,alpha,beta,gamma))
 
-boost_adaptbx.python.inject(ext.map_reader, utils) # A way to access these
-@boost_adaptbx.python.inject_into(ext.map_reader) # A way to access these
+bp.inject(ext.map_reader, utils) # A way to access these
+@bp.inject_into(ext.map_reader) # A way to access these
 class _():
 
   def dummy(self):
diff --git a/iotbx/cif/__init__.py b/iotbx/cif/__init__.py
index 593a74eae8..cb3cf19626 100644
--- a/iotbx/cif/__init__.py
+++ b/iotbx/cif/__init__.py
@@ -11,11 +11,11 @@
 """
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
 import six
-ext = boost_adaptbx.python.import_ext("iotbx_cif_ext")
+ext = bp.import_ext("iotbx_cif_ext")
 
 from cctbx.array_family import flex
 from cctbx import miller
diff --git a/iotbx/detectors/__init__.py b/iotbx/detectors/__init__.py
index 30a814a21b..7031762e32 100644
--- a/iotbx/detectors/__init__.py
+++ b/iotbx/detectors/__init__.py
@@ -2,8 +2,8 @@
 import os
 import re
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_detectors_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_detectors_ext")
 from iotbx_detectors_ext import *
 from iotbx_detectors_bruker_ext import Bruker_base # import dependency
 
diff --git a/iotbx/dsn6/__init__.py b/iotbx/dsn6/__init__.py
index a967ef855a..c6afac3a22 100644
--- a/iotbx/dsn6/__init__.py
+++ b/iotbx/dsn6/__init__.py
@@ -3,7 +3,7 @@
 
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_dsn6_map_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_dsn6_map_ext")
 from iotbx_dsn6_map_ext import *
 import iotbx_dsn6_map_ext as ext
diff --git a/iotbx/dtrek/reflnlist_reader.py b/iotbx/dtrek/reflnlist_reader.py
index 1941a04e83..5d737c8059 100644
--- a/iotbx/dtrek/reflnlist_reader.py
+++ b/iotbx/dtrek/reflnlist_reader.py
@@ -6,9 +6,9 @@
 from cctbx.array_family import flex
 import sys
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-dtrek_ext = boost_adaptbx.python.import_ext("iotbx_dtrek_ext")
+dtrek_ext = bp.import_ext("iotbx_dtrek_ext")
 
 class reflnlist(object):
 
diff --git a/iotbx/mtz/__init__.py b/iotbx/mtz/__init__.py
index 911880240b..ac01cf2c87 100644
--- a/iotbx/mtz/__init__.py
+++ b/iotbx/mtz/__init__.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("iotbx_mtz_ext")
+ext = bp.import_ext("iotbx_mtz_ext")
 from iotbx_mtz_ext import *
 import iotbx_mtz_ext as ext
 
@@ -42,7 +42,7 @@
 
 os.name: %s
 sys.platform: %s
-boost_adaptbx.python.platform_info: %s
+bp.platform_info: %s
 
 The iotbx.mtz module makes certain assumptions about the C structs in
 the CMtz library. This warning appears if the sizes of the C structs
@@ -56,7 +56,7 @@
   str(tuple(ext.cmtz_struct_sizes())),
   os.name,
   sys.platform,
-  boost_adaptbx.python.platform_info))
+  bp.platform_info))
 
 column_type_legend_source = "ccp4/doc/mtzformat.doc"
 column_type_legend = {
@@ -257,7 +257,7 @@ def tidy_show_column_data_format_keyword(input):
       "Column data format keyword not recognized: %s\n" % show_string(input)
     + "  Valid keywords are: %s" % ", ".join(show_column_data_format_keywords))
 
-@boost_adaptbx.python.inject_into(ext.object)
+@bp.inject_into(ext.object)
 class _():
 
   def space_group_info(self):
@@ -866,7 +866,7 @@ def find_group():
     all_types_x = overwrite_at(all_types_x, i_group_start, replacement)
   return all_types
 
-@boost_adaptbx.python.inject_into(ext.crystal)
+@bp.inject_into(ext.crystal)
 class _():
 
   def crystal_symmetry(self):
@@ -884,7 +884,7 @@ def miller_set(self, anomalous_flag=None):
       indices=self.mtz_object().extract_miller_indices(),
       anomalous_flag=anomalous_flag)
 
-@boost_adaptbx.python.inject_into(ext.dataset)
+@bp.inject_into(ext.dataset)
 class _():
 
   def column_labels(self):
@@ -1101,7 +1101,7 @@ def __init__(O, values, selection_valid):
   def as_tuple(O):
     return (O.values, O.selection_valid)
 
-@boost_adaptbx.python.inject_into(ext.column)
+@bp.inject_into(ext.column)
 class _():
 
   def extract_values_and_selection_valid(self, not_a_number_substitute=0):
@@ -1157,7 +1157,7 @@ def miller_array_as_mtz_dataset(self,
         column_types=column_types,
         label_decorator=label_decorator)
 
-@boost_adaptbx.python.inject_into(ext.batch)
+@bp.inject_into(ext.batch)
 class _():
 
   def show(self, out=None):
diff --git a/iotbx/pdb/__init__.py b/iotbx/pdb/__init__.py
index 7fcb72c0ff..61d47697aa 100644
--- a/iotbx/pdb/__init__.py
+++ b/iotbx/pdb/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("iotbx_pdb_ext")
+ext = bp.import_ext("iotbx_pdb_ext")
 from iotbx_pdb_ext import *
 
 import iotbx.pdb.records
@@ -1071,8 +1071,8 @@ def xray_structures_simple(self,
       raise Sorry(str(e))
     return result
 
-boost_adaptbx.python.inject(ext.input, pdb_input_mixin)
-@boost_adaptbx.python.inject_into(ext.input)
+bp.inject(ext.input, pdb_input_mixin)
+@bp.inject_into(ext.input)
 class _():
 
   """
diff --git a/iotbx/pdb/hierarchy.py b/iotbx/pdb/hierarchy.py
index 74c47e0d13..4fa5737eb1 100644
--- a/iotbx/pdb/hierarchy.py
+++ b/iotbx/pdb/hierarchy.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_pdb_hierarchy_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_pdb_hierarchy_ext")
 from iotbx_pdb_hierarchy_ext import *
 from libtbx.str_utils import show_sorted_by_counts
 from libtbx.utils import Sorry, plural_s, null_out
@@ -354,8 +354,8 @@ def __eq__(self, other):
   def __ne__(self, other):
     return not ( self == other )
 
-boost_adaptbx.python.inject(ext.root, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.root)
+bp.inject(ext.root, __hash_eq_mixin)
+@bp.inject_into(ext.root)
 class _():
 
   __doc__ = """
@@ -1700,8 +1700,8 @@ def is_ca_only(self):
       result = result and model.is_ca_only()
     return result
 
-boost_adaptbx.python.inject(ext.model, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.model)
+bp.inject(ext.model, __hash_eq_mixin)
+@bp.inject_into(ext.model)
 class _():
 
   """
@@ -1761,8 +1761,8 @@ def is_ca_only(self):
       result = result and chain.is_ca_only()
     return result
 
-boost_adaptbx.python.inject(ext.chain, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.chain)
+bp.inject(ext.chain, __hash_eq_mixin)
+@bp.inject_into(ext.chain)
 class _():
 
   """
@@ -2027,8 +2027,8 @@ def is_ca_only(self):
     atom_names = self.atoms().extract_name()
     return atom_names.all_eq(" CA ")
 
-boost_adaptbx.python.inject(ext.residue_group, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.residue_group)
+bp.inject(ext.residue_group, __hash_eq_mixin)
+@bp.inject_into(ext.residue_group)
 class _():
 
   def only_atom_group(self):
@@ -2045,8 +2045,8 @@ def id_str(self):
       chain_id = chain.id
     return "%2s%4s%1s" % (chain_id, self.resseq, self.icode)
 
-boost_adaptbx.python.inject(ext.atom_group, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.atom_group)
+bp.inject(ext.atom_group, __hash_eq_mixin)
+@bp.inject_into(ext.atom_group)
 class _():
 
   def only_atom(self):
@@ -2080,8 +2080,8 @@ def occupancy(self, raise_error_if_non_uniform=False):
           min_max_mean.max))
     return min_max_mean.mean
 
-boost_adaptbx.python.inject(ext.atom, __hash_eq_mixin)
-@boost_adaptbx.python.inject_into(ext.atom)
+bp.inject(ext.atom, __hash_eq_mixin)
+@bp.inject_into(ext.atom)
 class _():
   __doc__ = """
   The basic unit of the PDB hierarchy (or the PDB input object in general),
@@ -2163,7 +2163,7 @@ def charge_as_int(self):
     else:
       return 0
 
-@boost_adaptbx.python.inject_into(ext.conformer)
+@bp.inject_into(ext.conformer)
 class _():
 
   __doc__ = """
@@ -2355,7 +2355,7 @@ def get_residue_names_padded(
     return resnames
 
 
-@boost_adaptbx.python.inject_into(ext.residue)
+@bp.inject_into(ext.residue)
 class _():
 
   def __getinitargs__(self):
@@ -2400,7 +2400,7 @@ def residue_name_plus_atom_names_interpreter(self,
       return_mon_lib_dna_name=return_mon_lib_dna_name)
 
 
-@boost_adaptbx.python.inject_into(ext.atom_with_labels)
+@bp.inject_into(ext.atom_with_labels)
 class _():
 
   __doc__ = """
diff --git a/iotbx/scalepack/no_merge_original_index.py b/iotbx/scalepack/no_merge_original_index.py
index f55bb8de68..930fb9788e 100644
--- a/iotbx/scalepack/no_merge_original_index.py
+++ b/iotbx/scalepack/no_merge_original_index.py
@@ -7,9 +7,9 @@
 import warnings
 import sys, os
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-scalepack_ext = boost_adaptbx.python.import_ext("iotbx_scalepack_ext")
+scalepack_ext = bp.import_ext("iotbx_scalepack_ext")
 
 # scalepack manual, edition 5, page 132
 # no merge
diff --git a/iotbx/shelx/__init__.py b/iotbx/shelx/__init__.py
index 8f56d2efaf..73fc2f8597 100644
--- a/iotbx/shelx/__init__.py
+++ b/iotbx/shelx/__init__.py
@@ -4,8 +4,8 @@
 from iotbx.shelx.parsers import *
 import iotbx.shelx.writer # implicit import
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_shelx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_shelx_ext")
 
 def _cctbx_xray_structure_from(file=None, filename=None,
                                set_grad_flags=True,
diff --git a/iotbx/shelx/hklf.py b/iotbx/shelx/hklf.py
index f98a375c09..1f4fe5aebf 100644
--- a/iotbx/shelx/hklf.py
+++ b/iotbx/shelx/hklf.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-iotbx_shelx_ext = boost_adaptbx.python.import_ext("iotbx_shelx_ext")
+import boost_adaptbx.boost.python as bp
+iotbx_shelx_ext = bp.import_ext("iotbx_shelx_ext")
 import sys
 from cctbx.array_family import flex
 
diff --git a/iotbx/shelx/parsers.py b/iotbx/shelx/parsers.py
index 8fa4de0595..7fd8a2198d 100644
--- a/iotbx/shelx/parsers.py
+++ b/iotbx/shelx/parsers.py
@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function
 
 from six.moves import zip_longest
-from boost_adaptbx import rational
+from boost_adaptbx.boost import rational
 from collections import OrderedDict
 
 from cctbx import uctbx
diff --git a/iotbx/wildcard.py b/iotbx/wildcard.py
index 29534506a5..12843a9a8c 100644
--- a/iotbx/wildcard.py
+++ b/iotbx/wildcard.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_wildcard_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_wildcard_ext")
 from iotbx_wildcard_ext import *
diff --git a/iotbx/xplor/ext.py b/iotbx/xplor/ext.py
index 14c0a35146..30a943dcbd 100644
--- a/iotbx/xplor/ext.py
+++ b/iotbx/xplor/ext.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("iotbx_xplor_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("iotbx_xplor_ext")
 from iotbx_xplor_ext import *
diff --git a/libtbx/introspection.py b/libtbx/introspection.py
index bfada59a43..00330891b3 100644
--- a/libtbx/introspection.py
+++ b/libtbx/introspection.py
@@ -270,10 +270,10 @@ def number_of_processors(return_value_if_unknown=None):
       else:
         _number_of_processors = n
     if (_number_of_processors is None):
-      try: import boost_adaptbx.python
+      try: import boost_adaptbx.boost.python as bp
       except ImportError: pass
       else:
-        n = boost_adaptbx.python.ext.number_of_processors()
+        n = bp.ext.number_of_processors()
         if (n != 0):
           _number_of_processors = n
     if (_number_of_processors is None):
diff --git a/libtbx/str_utils.py b/libtbx/str_utils.py
index 689423d026..3620638d07 100644
--- a/libtbx/str_utils.py
+++ b/libtbx/str_utils.py
@@ -72,7 +72,7 @@ def string_representation(string, preferred_quote, alternative_quote):
   if (not _have_string_representation):
     _have_string_representation = True
     try:
-      from boost_adaptbx.python import ext as _
+      from boost_adaptbx.boost.python import ext as _
       string_representation = _.string_representation
     except Exception:
       string_representation = py_string_representation
diff --git a/libtbx/tst_scheduling.py b/libtbx/tst_scheduling.py
index 1f009fb458..aba5601366 100644
--- a/libtbx/tst_scheduling.py
+++ b/libtbx/tst_scheduling.py
@@ -26,8 +26,8 @@ def raise_sorry(message, wait):
 def crash_python(wait):
 
   time.sleep( wait )
-  import boost_adaptbx.python
-  boost_adaptbx.python.ext.dereference_char_pointer(None)
+  import boost_adaptbx.boost.python as bp
+  bp.ext.dereference_char_pointer(None)
 
 
 class TestManager(unittest.TestCase):
diff --git a/mmtbx/alignment/__init__.py b/mmtbx/alignment/__init__.py
index 21831830f8..c9cd9f87e3 100644
--- a/mmtbx/alignment/__init__.py
+++ b/mmtbx/alignment/__init__.py
@@ -2,11 +2,11 @@
 import scitbx.array_family.flex
 from scitbx.array_family import flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six import string_types
 from six.moves import zip
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_alignment_ext")
+ext = bp.import_ext("mmtbx_alignment_ext")
 
 """
 Written by Tom Ioerger (http://faculty.cs.tamu.edu/ioerger).
diff --git a/mmtbx/arrays.py b/mmtbx/arrays.py
index 0c9b7dff0f..027245942f 100644
--- a/mmtbx/arrays.py
+++ b/mmtbx/arrays.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex
 from libtbx import adopt_init_args
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 from cctbx import miller
 
 class init(object): # XXX PVA: Why Fobs, HL and r_free_flags are not here?
diff --git a/mmtbx/building/loop_closure/ccd.py b/mmtbx/building/loop_closure/ccd.py
index c4ce4fce5c..79ada194b3 100644
--- a/mmtbx/building/loop_closure/ccd.py
+++ b/mmtbx/building/loop_closure/ccd.py
@@ -11,15 +11,15 @@
 from libtbx.test_utils import approx_equal
 from libtbx.utils import null_out
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip,range
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 
-ext2 = boost_adaptbx.python.import_ext("mmtbx_building_loop_closure_ext")
+ext2 = bp.import_ext("mmtbx_building_loop_closure_ext")
 from mmtbx_building_loop_closure_ext import ccd_cpp
 
-@boost_adaptbx.python.inject_into(ccd_cpp)
+@bp.inject_into(ccd_cpp)
 class _():
 
   def run(self, direction_forward=True, save_states=False, avoid_allowed_region=False):
diff --git a/mmtbx/building/loop_closure/starting_conformations.py b/mmtbx/building/loop_closure/starting_conformations.py
index 6ab139194d..66856632a9 100644
--- a/mmtbx/building/loop_closure/starting_conformations.py
+++ b/mmtbx/building/loop_closure/starting_conformations.py
@@ -7,10 +7,10 @@
 import random
 from libtbx.utils import null_out
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 
 from six.moves import cStringIO as StringIO
diff --git a/mmtbx/building/loop_closure/utils.py b/mmtbx/building/loop_closure/utils.py
index fbfc54232e..c6c64bdd0d 100644
--- a/mmtbx/building/loop_closure/utils.py
+++ b/mmtbx/building/loop_closure/utils.py
@@ -9,10 +9,10 @@
 from scitbx.math import dihedral_angle
 # from scitbx.matrix import _dihedral_angle # python implementation, but on flex arrays
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 
 def get_phi_psi_atoms(hierarchy, omega=False):
diff --git a/mmtbx/building/loop_idealization.py b/mmtbx/building/loop_idealization.py
index 90a748aef0..633abc7aa9 100644
--- a/mmtbx/building/loop_idealization.py
+++ b/mmtbx/building/loop_idealization.py
@@ -19,8 +19,8 @@
 import mmtbx.idealized_aa_residues.rotamer_manager
 import mmtbx.refinement.real_space.fit_residues
 
-#import boost_adaptbx.python
-#ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+#import boost_adaptbx.boost.python as bp
+#ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 #from mmtbx_validation_ramachandran_ext import rama_eval
 
 from iotbx.pdb.hybrid_36 import hy36encode, hy36decode
diff --git a/mmtbx/bulk_solvent/__init__.py b/mmtbx/bulk_solvent/__init__.py
index 6abecd5805..ac26f27924 100644
--- a/mmtbx/bulk_solvent/__init__.py
+++ b/mmtbx/bulk_solvent/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_bulk_solvent_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_bulk_solvent_ext")
 from mmtbx_bulk_solvent_ext import *
 from mmtbx.bulk_solvent.multi_mask_bulk_solvent import multi_mask_bulk_solvent # special import
diff --git a/mmtbx/bulk_solvent/bulk_solvent_and_scaling.py b/mmtbx/bulk_solvent/bulk_solvent_and_scaling.py
index 1ad88dab74..0790e47a6b 100644
--- a/mmtbx/bulk_solvent/bulk_solvent_and_scaling.py
+++ b/mmtbx/bulk_solvent/bulk_solvent_and_scaling.py
@@ -5,9 +5,9 @@
 from cctbx import adptbx
 from libtbx import group_args
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 
 master_params = iotbx.phil.parse("""\
   bulk_solvent = True
diff --git a/mmtbx/bulk_solvent/multi_mask_bulk_solvent.py b/mmtbx/bulk_solvent/multi_mask_bulk_solvent.py
index d44e5e4fec..e7da038c62 100644
--- a/mmtbx/bulk_solvent/multi_mask_bulk_solvent.py
+++ b/mmtbx/bulk_solvent/multi_mask_bulk_solvent.py
@@ -4,10 +4,10 @@
 from cctbx import maptbx
 import mmtbx.masks
 import mmtbx.bulk_solvent
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from mmtbx import map_tools
 import cctbx.miller
 from libtbx.test_utils import approx_equal
diff --git a/mmtbx/bulk_solvent/scaler.py b/mmtbx/bulk_solvent/scaler.py
index d816419a81..8e0463551c 100644
--- a/mmtbx/bulk_solvent/scaler.py
+++ b/mmtbx/bulk_solvent/scaler.py
@@ -3,9 +3,9 @@
 import sys
 from mmtbx import bulk_solvent
 from cctbx import adptbx
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 from cctbx import sgtbx
 from mmtbx.bulk_solvent import kbu_refinery
 import mmtbx.f_model
diff --git a/mmtbx/bulk_solvent/tst_aniso_scaler.py b/mmtbx/bulk_solvent/tst_aniso_scaler.py
index b67ca666fe..be4872f858 100644
--- a/mmtbx/bulk_solvent/tst_aniso_scaler.py
+++ b/mmtbx/bulk_solvent/tst_aniso_scaler.py
@@ -7,8 +7,8 @@
 from cctbx import adptbx
 from cctbx import sgtbx
 from cctbx.development import random_structure
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_f_model_ext")
 from mmtbx import bulk_solvent
 
 if(1):
diff --git a/mmtbx/bulk_solvent/tst_kb_sol_u_star_fd.py b/mmtbx/bulk_solvent/tst_kb_sol_u_star_fd.py
index b77ff2a570..af8cdd9a2a 100644
--- a/mmtbx/bulk_solvent/tst_kb_sol_u_star_fd.py
+++ b/mmtbx/bulk_solvent/tst_kb_sol_u_star_fd.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.development import random_structure
 from cctbx.sgtbx import space_group_info
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from cctbx_asymmetric_map_ext import *
 from cctbx.array_family import flex
 from cctbx import maptbx
@@ -13,8 +13,8 @@
 from libtbx.test_utils import approx_equal
 from cctbx import adptbx
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_f_model_ext")
 
 def get_f_masks(xrs, miller_array):
   crystal_gridding = maptbx.crystal_gridding(
diff --git a/mmtbx/bulk_solvent/tst_scaler.py b/mmtbx/bulk_solvent/tst_scaler.py
index 82b26789c8..468a24e906 100644
--- a/mmtbx/bulk_solvent/tst_scaler.py
+++ b/mmtbx/bulk_solvent/tst_scaler.py
@@ -7,8 +7,8 @@
 from cctbx import adptbx
 from cctbx import sgtbx
 from cctbx.development import random_structure
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_f_model_ext")
 from mmtbx.bulk_solvent import scaler
 
 if(1):
diff --git a/mmtbx/cablam/cablam_align.py b/mmtbx/cablam/cablam_align.py
index 38a34b31c6..4bd0a08f1f 100644
--- a/mmtbx/cablam/cablam_align.py
+++ b/mmtbx/cablam/cablam_align.py
@@ -12,9 +12,9 @@
 from iotbx import pdb
 from iotbx import file_reader
 from libtbx import group_args
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-cpputils = boost_adaptbx.python.import_ext("mmtbx_cablam_align_utils_ext")
+cpputils = bp.import_ext("mmtbx_cablam_align_utils_ext")
 
 # {{{ phil
 #-------------------------------------------------------------------------------
@@ -383,4 +383,3 @@ def run(args):
   run(sys.argv[1:])
 #-------------------------------------------------------------------------------
 #}}}
-
diff --git a/mmtbx/command_line/model_idealization.py b/mmtbx/command_line/model_idealization.py
index 1af54c4ae3..909d4152e6 100644
--- a/mmtbx/command_line/model_idealization.py
+++ b/mmtbx/command_line/model_idealization.py
@@ -985,8 +985,8 @@ def get_map_from_map(map_file_object, params, xrs, log):
 
   if params.mask_and_he_map:
     print("Masking and histogram equalizing...", file=log)
-    import boost_adaptbx.python
-    cctbx_maptbx_ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
+    import boost_adaptbx.boost.python as bp
+    cctbx_maptbx_ext = bp.import_ext("cctbx_maptbx_ext")
     xrs_p1 = xray_structure.expand_to_p1(sites_mod_positive=True)
     radii = flex.double(xrs_p1.scatterers().size(), 5.0)
     mask = cctbx_maptbx_ext.mask(
diff --git a/mmtbx/den/__init__.py b/mmtbx/den/__init__.py
index 8bf9d8e7dd..621015c244 100644
--- a/mmtbx/den/__init__.py
+++ b/mmtbx/den/__init__.py
@@ -145,8 +145,8 @@ def __init__(self,
     elif self.use_model_segid and (not self.use_ref_segid):
       raise Sorry("Working model contains SEGIDs that do not match "+\
                   "the reference model.")
-    import boost_adaptbx.python
-    self.ext = boost_adaptbx.python.import_ext("mmtbx_den_restraints_ext")
+    import boost_adaptbx.boost.python as bp
+    self.ext = bp.import_ext("mmtbx_den_restraints_ext")
     self.params = params
     self.kappa = params.kappa
     self.kappa_burn_in_cycles = params.kappa_burn_in_cycles
diff --git a/mmtbx/dynamics/__init__.py b/mmtbx/dynamics/__init__.py
index c901e6311a..8911649a24 100644
--- a/mmtbx/dynamics/__init__.py
+++ b/mmtbx/dynamics/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_dynamics_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_dynamics_ext")
 from mmtbx_dynamics_ext import *
 
 def kinetic_energy_as_temperature(dof, e):
diff --git a/mmtbx/f_model/f_model.py b/mmtbx/f_model/f_model.py
index 806250e899..c6a0e8f1e3 100644
--- a/mmtbx/f_model/f_model.py
+++ b/mmtbx/f_model/f_model.py
@@ -18,7 +18,7 @@
 import math
 from cctbx import xray
 from cctbx import adptbx
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import mmtbx
 from libtbx.math_utils import iround
 from libtbx.utils import user_plus_sys_time, date_and_time, Sorry
@@ -44,7 +44,7 @@
 import six
 from six.moves import zip, range
 
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 
 time_bulk_solvent_and_scale         = 0.0
 time_mask                           = 0.0
@@ -1132,7 +1132,7 @@ def update_f_part1(self):
     mmtbx_masks_asu_mask_obj = mmtbx.masks.asu_mask(
       xray_structure = S_E_L_F.xray_structure.expand_to_p1(sites_mod_positive=True),
       n_real         = crystal_gridding.n_real())
-    asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+    asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
     bulk_solvent_mask = mmtbx_masks_asu_mask_obj.mask_data_whole_uc()
     # residual map
     mc = S_E_L_F.electron_density_map().map_coefficients(
diff --git a/mmtbx/geometry/asa.py b/mmtbx/geometry/asa.py
index b9193f838e..3aec397dcb 100644
--- a/mmtbx/geometry/asa.py
+++ b/mmtbx/geometry/asa.py
@@ -2,9 +2,9 @@
 
 import mmtbx.geometry.shared_types # import dependency
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext( "mmtbx_geometry_asa_ext" )
+ext = bp.import_ext( "mmtbx_geometry_asa_ext" )
 from mmtbx_geometry_asa_ext import *
 
 from mmtbx.geometry import altloc
diff --git a/mmtbx/geometry/clash.py b/mmtbx/geometry/clash.py
index c5ea6e01ea..7adfbd3dfc 100644
--- a/mmtbx/geometry/clash.py
+++ b/mmtbx/geometry/clash.py
@@ -3,10 +3,10 @@
 from cctbx import sgtbx # import dependency
 import mmtbx.geometry.shared_types # import dependency
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from functools import reduce
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext( "mmtbx_geometry_clash_ext" )
+ext = bp.import_ext( "mmtbx_geometry_clash_ext" )
 from mmtbx_geometry_clash_ext import *
 
 def to_xray_structure(atoms, symmetry):
@@ -586,4 +586,3 @@ def calculate(
       calculation( asu = asu, descriptor = d, accumulator = accumulator )
 
   return accumulator.result
-
diff --git a/mmtbx/geometry/indexing.py b/mmtbx/geometry/indexing.py
index aa675e24e8..579ec21a8e 100644
--- a/mmtbx/geometry/indexing.py
+++ b/mmtbx/geometry/indexing.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "mmtbx_geometry_indexing_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "mmtbx_geometry_indexing_ext" )
 from mmtbx_geometry_indexing_ext import *
 
 def filter(range, predicate):
@@ -242,4 +242,3 @@ def hash(
       datagen = datagen,
       maxdist = maxdist,
       )
-
diff --git a/mmtbx/geometry/shared_types.py b/mmtbx/geometry/shared_types.py
index 4c55aecfc2..b9254703a3 100644
--- a/mmtbx/geometry/shared_types.py
+++ b/mmtbx/geometry/shared_types.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "mmtbx_geometry_shared_types_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "mmtbx_geometry_shared_types_ext" )
 from mmtbx_geometry_shared_types_ext import *
 
 def calculate_base_for_coordinates(xyzs):
@@ -12,4 +12,3 @@ def calculate_base_for_coordinates(xyzs):
   else:
     ( xs, ys, zs ) = xyzs.parts()
     return ( min( xs ), min( ys ), min( zs ) )
-
diff --git a/mmtbx/geometry/sphere_surface_sampling.py b/mmtbx/geometry/sphere_surface_sampling.py
index 090a130bec..affabe2f05 100644
--- a/mmtbx/geometry/sphere_surface_sampling.py
+++ b/mmtbx/geometry/sphere_surface_sampling.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "mmtbx_geometry_sphere_surface_sampling_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "mmtbx_geometry_sphere_surface_sampling_ext" )
 from mmtbx_geometry_sphere_surface_sampling_ext import *
-
diff --git a/mmtbx/geometry_restraints/ramachandran.py b/mmtbx/geometry_restraints/ramachandran.py
index 2a60d542e5..9c51b69414 100644
--- a/mmtbx/geometry_restraints/ramachandran.py
+++ b/mmtbx/geometry_restraints/ramachandran.py
@@ -4,7 +4,7 @@
 from libtbx import adopt_init_args
 import sys
 import os, math
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from scitbx.array_family import flex
 from mmtbx.validation import ramalyze
 from mmtbx.conformation_dependent_library import generate_protein_threes
@@ -12,10 +12,10 @@
 from collections import OrderedDict
 from mmtbx.rotamer import ramachandran_eval
 
-ext = boost_adaptbx.python.import_ext("mmtbx_ramachandran_restraints_ext")
+ext = bp.import_ext("mmtbx_ramachandran_restraints_ext")
 from mmtbx_ramachandran_restraints_ext import lookup_table, \
     ramachandran_residual_sum, phi_psi_targets
-ext2 = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext2 = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 
 old_master_phil = iotbx.phil.parse("""
diff --git a/mmtbx/geometry_restraints/reference.py b/mmtbx/geometry_restraints/reference.py
index f822c1029d..54aa80d56e 100644
--- a/mmtbx/geometry_restraints/reference.py
+++ b/mmtbx/geometry_restraints/reference.py
@@ -2,8 +2,8 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex
 from cctbx import geometry_restraints
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_reference_coordinate_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_reference_coordinate_ext")
 from mmtbx.rotamer.sidechain_angles import collect_residue_torsion_angles
 
 
@@ -70,8 +70,8 @@ def add_coordinate_restraints(
       sigma=0.5,
       limit=1.0,
       top_out_potential=False):
-  import boost_adaptbx.python
-  ext_rcp = boost_adaptbx.python.import_ext("mmtbx_reference_coordinate_ext")
+  import boost_adaptbx.boost.python as bp
+  ext_rcp = bp.import_ext("mmtbx_reference_coordinate_ext")
   result = ext_rcp.shared_reference_coordinate_proxy()
   if (selection is not None):
     if (isinstance(selection, flex.bool)):
diff --git a/mmtbx/geometry_restraints/tst_ramachandran.py b/mmtbx/geometry_restraints/tst_ramachandran.py
index 3bd4d95cf4..1879189d15 100644
--- a/mmtbx/geometry_restraints/tst_ramachandran.py
+++ b/mmtbx/geometry_restraints/tst_ramachandran.py
@@ -9,7 +9,7 @@
 import cctbx.geometry_restraints
 import scitbx.lbfgs
 from scitbx.array_family import flex
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from libtbx.test_utils import approx_equal, show_diff
 import libtbx.load_env
 from libtbx import group_args
@@ -33,7 +33,7 @@ def exercise_basic():
   assert approx_equal(e1, e2, eps=0.000001)
   assert approx_equal(t.get_energy(-85.0, 86.0), 21.3345, eps=0.001)
   assert approx_equal(t.get_energy(-86.0, 85.0), 21.389, eps=0.001)
-  ext = boost_adaptbx.python.import_ext("mmtbx_ramachandran_restraints_ext")
+  ext = bp.import_ext("mmtbx_ramachandran_restraints_ext")
   proxies = ext.shared_phi_psi_proxy()
   proxies.append(
     ext.phi_psi_proxy(
diff --git a/mmtbx/geometry_restraints/tst_reference_coordinate.py b/mmtbx/geometry_restraints/tst_reference_coordinate.py
index 5f8a365a18..1b0a8a96ea 100644
--- a/mmtbx/geometry_restraints/tst_reference_coordinate.py
+++ b/mmtbx/geometry_restraints/tst_reference_coordinate.py
@@ -131,8 +131,8 @@ def exercise_1():
 
   proxies = reference.add_coordinate_restraints(sites_cart=sites_cart)
   assert proxies.size() == 29, "expected 29, got %d" % proxies.size()
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("mmtbx_reference_coordinate_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("mmtbx_reference_coordinate_ext")
   grads = flex.vec3_double(sites_cart.size(), (0.0,0.0,0.0))
   residual = ext.reference_coordinate_residual_sum(
       sites_cart=sites_cart,
diff --git a/mmtbx/hydrogens/__init__.py b/mmtbx/hydrogens/__init__.py
index d1f587ea20..7c1d07253c 100644
--- a/mmtbx/hydrogens/__init__.py
+++ b/mmtbx/hydrogens/__init__.py
@@ -7,11 +7,11 @@
 import mmtbx.model
 from libtbx.utils import null_out
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import six
 from six.moves import range
 
-ext = boost_adaptbx.python.import_ext("cctbx_geometry_restraints_ext")
+ext = bp.import_ext("cctbx_geometry_restraints_ext")
 
 def mon_lib_query(residue, mon_lib_srv):
     get_func = getattr(mon_lib_srv, "get_comp_comp_id", None)
diff --git a/mmtbx/map_tools.py b/mmtbx/map_tools.py
index 0ccc4bc10f..e1bd9fb308 100644
--- a/mmtbx/map_tools.py
+++ b/mmtbx/map_tools.py
@@ -13,9 +13,9 @@
 import mmtbx
 import libtbx
 import random
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-mmtbx_f_model_ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+mmtbx_f_model_ext = bp.import_ext("mmtbx_f_model_ext")
 import mmtbx.masks
 
 def shelx_weight(
diff --git a/mmtbx/maps/composite_omit_map.py b/mmtbx/maps/composite_omit_map.py
index 224c5361e9..1eb2f1709f 100644
--- a/mmtbx/maps/composite_omit_map.py
+++ b/mmtbx/maps/composite_omit_map.py
@@ -11,10 +11,10 @@
 from cctbx import maptbx
 import cctbx.miller
 from scitbx.array_family import flex
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from libtbx import slots_getstate_setstate, \
   slots_getstate_setstate_default_initializer
 from libtbx.utils import null_out
diff --git a/mmtbx/maps/correlation.py b/mmtbx/maps/correlation.py
index a34b6acd4d..49b9a73d9b 100644
--- a/mmtbx/maps/correlation.py
+++ b/mmtbx/maps/correlation.py
@@ -6,9 +6,9 @@
 from cctbx import adptbx
 from mmtbx import masks
 import sys
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-cctbx_maptbx_ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
+cctbx_maptbx_ext = bp.import_ext("cctbx_maptbx_ext")
 from libtbx import group_args
 
 def get_selection_above_cutoff(m, n):
diff --git a/mmtbx/maps/tst_composite_omit_map.py b/mmtbx/maps/tst_composite_omit_map.py
index e5ac51095f..554b4ff5f0 100644
--- a/mmtbx/maps/tst_composite_omit_map.py
+++ b/mmtbx/maps/tst_composite_omit_map.py
@@ -3,10 +3,10 @@
 from cctbx import miller
 from cctbx.development import random_structure
 from cctbx.sgtbx import space_group_info
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from mmtbx.maps import composite_omit_map as cfom
 from cctbx import maptbx
 import mmtbx.maps
diff --git a/mmtbx/maps/tst_composite_omit_map_3.py b/mmtbx/maps/tst_composite_omit_map_3.py
index 83de8067ef..79bbe55651 100644
--- a/mmtbx/maps/tst_composite_omit_map_3.py
+++ b/mmtbx/maps/tst_composite_omit_map_3.py
@@ -3,8 +3,8 @@
 from cctbx import miller
 from cctbx.development import random_structure
 from cctbx.sgtbx import space_group_info
-import boost_adaptbx.python
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+import boost_adaptbx.boost.python as bp
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 from mmtbx.maps import composite_omit_map as cfom
 from cctbx import maptbx
 import mmtbx.f_model
diff --git a/mmtbx/maps/tst_correlation.py b/mmtbx/maps/tst_correlation.py
index 172d721d65..9ba98468d5 100644
--- a/mmtbx/maps/tst_correlation.py
+++ b/mmtbx/maps/tst_correlation.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex
-import boost_adaptbx.python
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+import boost_adaptbx.boost.python as bp
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 import iotbx.pdb
 from mmtbx.maps import correlation
 from libtbx.test_utils import approx_equal
diff --git a/mmtbx/masks/__init__.py b/mmtbx/masks/__init__.py
index d693f18bf2..99d3e6424a 100644
--- a/mmtbx/masks/__init__.py
+++ b/mmtbx/masks/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from cctbx.array_family import flex
 from six.moves import zip
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_masks_ext")
+ext = bp.import_ext("mmtbx_masks_ext")
 from mmtbx_masks_ext import *
 
 from cctbx.masks import around_atoms, vdw_radii_from_xray_structure
@@ -16,7 +16,7 @@
 from libtbx import adopt_init_args
 from copy import deepcopy
 import mmtbx.masks
-asu_map_ext = boost_adaptbx.python.import_ext("cctbx_asymmetric_map_ext")
+asu_map_ext = bp.import_ext("cctbx_asymmetric_map_ext")
 
 number_of_mask_calculations = 0
 
diff --git a/mmtbx/masks/tst_masks.py b/mmtbx/masks/tst_masks.py
index 958c9bd2ec..c4ebde3236 100644
--- a/mmtbx/masks/tst_masks.py
+++ b/mmtbx/masks/tst_masks.py
@@ -11,8 +11,8 @@
 from libtbx.test_utils import approx_equal
 import math
 import sys
-#import boost_adaptbx.python
-#ext = boost_adaptbx.python.import_ext("mmtbx_masks_ext")
+#import boost_adaptbx.boost.python as bp
+#ext = bp.import_ext("mmtbx_masks_ext")
 #from mmtbx_masks_ext import *
 from cctbx.masks import around_atoms
 import mmtbx.masks
diff --git a/mmtbx/max_lik/__init__.py b/mmtbx/max_lik/__init__.py
index 04328f7de7..383336d642 100644
--- a/mmtbx/max_lik/__init__.py
+++ b/mmtbx/max_lik/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_max_lik_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_max_lik_ext")
 from mmtbx_max_lik_ext import *
diff --git a/mmtbx/max_lik/max_like_non_uniform.py b/mmtbx/max_lik/max_like_non_uniform.py
index b680972ad2..1b5b940faa 100644
--- a/mmtbx/max_lik/max_like_non_uniform.py
+++ b/mmtbx/max_lik/max_like_non_uniform.py
@@ -10,13 +10,13 @@
 from scitbx import matrix
 from cctbx.eltbx.xray_scattering import wk1995
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_max_lik_ext")
+ext = bp.import_ext("mmtbx_max_lik_ext")
 from mmtbx_max_lik_ext import *
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_masks_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_masks_ext")
 from mmtbx_masks_ext import *
 
 
diff --git a/mmtbx/model/model.py b/mmtbx/model/model.py
index 8c7d47b2fc..91a1f7db49 100644
--- a/mmtbx/model/model.py
+++ b/mmtbx/model/model.py
@@ -53,19 +53,19 @@
 from mmtbx.validation.sequence import master_phil as sequence_master_phil
 from mmtbx.validation.sequence import validation as sequence_validation
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import six
 from six.moves import zip
 from six.moves import range
 
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 from mmtbx.rotamer.rotamer_eval import RotamerEval
 from mmtbx.rotamer.rotamer_eval import RotamerID
 
 from mmtbx.geometry_restraints import ramachandran
 
-ext2 = boost_adaptbx.python.import_ext("iotbx_pdb_hierarchy_ext")
+ext2 = bp.import_ext("iotbx_pdb_hierarchy_ext")
 from iotbx_pdb_hierarchy_ext import *
 
 from six.moves import cStringIO as StringIO
diff --git a/mmtbx/ncs/cartesian_restraints.py b/mmtbx/ncs/cartesian_restraints.py
index 46d3344ec0..a2f3e34bec 100644
--- a/mmtbx/ncs/cartesian_restraints.py
+++ b/mmtbx/ncs/cartesian_restraints.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_cartesian_restraints_ext")
+ext = bp.import_ext("mmtbx_ncs_cartesian_restraints_ext")
 from mmtbx_ncs_cartesian_restraints_ext import *
 
 from cctbx import adptbx
diff --git a/mmtbx/ncs/tncs.py b/mmtbx/ncs/tncs.py
index febe849244..63710aed68 100644
--- a/mmtbx/ncs/tncs.py
+++ b/mmtbx/ncs/tncs.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_ext")
+ext = bp.import_ext("mmtbx_ncs_ext")
 from scitbx.array_family import flex
 from cctbx import sgtbx
 from libtbx import adopt_init_args
diff --git a/mmtbx/pair_interaction/__init__.py b/mmtbx/pair_interaction/__init__.py
index 19e7310a24..14bbe6fad7 100644
--- a/mmtbx/pair_interaction/__init__.py
+++ b/mmtbx/pair_interaction/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_pair_interaction_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_pair_interaction_ext")
 from mmtbx_pair_interaction_ext import *
diff --git a/mmtbx/pair_interaction/pair_interaction.py b/mmtbx/pair_interaction/pair_interaction.py
index e9a7415b98..d363ad7973 100644
--- a/mmtbx/pair_interaction/pair_interaction.py
+++ b/mmtbx/pair_interaction/pair_interaction.py
@@ -8,8 +8,8 @@
 from libtbx import easy_pickle
 from libtbx.utils import Sorry
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_pair_interaction_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_pair_interaction_ext")
 
 dat_path = libtbx.env.find_in_repositories("qrefine")
 qr_unit_tests_data = None
diff --git a/mmtbx/pair_interaction/tst_00.py b/mmtbx/pair_interaction/tst_00.py
index 75704c4989..f90db95990 100644
--- a/mmtbx/pair_interaction/tst_00.py
+++ b/mmtbx/pair_interaction/tst_00.py
@@ -3,8 +3,8 @@
 from mmtbx.pair_interaction import pair_interaction
 from libtbx.test_utils import approx_equal
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_pair_interaction_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_pair_interaction_ext")
 
 pdb_str = """
 ATOM     49  C   TYR A   7      10.603   2.331   6.885  1.00 15.91           C
diff --git a/mmtbx/refinement/real_space/fit_residue.py b/mmtbx/refinement/real_space/fit_residue.py
index 231b43f18b..cff2c46930 100644
--- a/mmtbx/refinement/real_space/fit_residue.py
+++ b/mmtbx/refinement/real_space/fit_residue.py
@@ -10,9 +10,9 @@
 import collections
 from libtbx import group_args
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_rotamer_fit_ext")
+ext = bp.import_ext("mmtbx_rotamer_fit_ext")
 
 def flatten(l):
   if l is None: return None
@@ -556,8 +556,8 @@ def backrub_move(
     accept_worse_rama=False,
     rotamer_manager=None,
     rama_manager=None):
-  import boost_adaptbx.python
-  ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+  import boost_adaptbx.boost.python as bp
+  ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
   from mmtbx_validation_ramachandran_ext import rama_eval
   from scitbx.matrix import rotate_point_around_axis
   from mmtbx.conformation_dependent_library.multi_residue_class import ThreeProteinResidues, \
diff --git a/mmtbx/refinement/real_space/fit_residues.py b/mmtbx/refinement/real_space/fit_residues.py
index 077f0e7249..82340de5fd 100644
--- a/mmtbx/refinement/real_space/fit_residues.py
+++ b/mmtbx/refinement/real_space/fit_residues.py
@@ -6,9 +6,9 @@
 import mmtbx.refinement.real_space.fit_residue
 import sys, time
 from cctbx import crystal
-import boost_adaptbx.python
-cctbx_maptbx_ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
-fit_ext = boost_adaptbx.python.import_ext("mmtbx_rotamer_fit_ext")
+import boost_adaptbx.boost.python as bp
+cctbx_maptbx_ext = bp.import_ext("cctbx_maptbx_ext")
+fit_ext = bp.import_ext("mmtbx_rotamer_fit_ext")
 
 negate_map_table = {
   #"ala": False,
diff --git a/mmtbx/refinement/real_space/rigid_body.py b/mmtbx/refinement/real_space/rigid_body.py
index b1780d4df9..6c451c59c3 100644
--- a/mmtbx/refinement/real_space/rigid_body.py
+++ b/mmtbx/refinement/real_space/rigid_body.py
@@ -8,9 +8,9 @@
 from libtbx.test_utils import approx_equal
 from libtbx import adopt_init_args
 import sys
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-cctbx_maptbx_ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
+cctbx_maptbx_ext = bp.import_ext("cctbx_maptbx_ext")
 from cctbx import miller
 import mmtbx.utils
 
diff --git a/mmtbx/refinement/targets.py b/mmtbx/refinement/targets.py
index cdff3e9230..0c2af359f1 100644
--- a/mmtbx/refinement/targets.py
+++ b/mmtbx/refinement/targets.py
@@ -6,14 +6,14 @@
   import phaser.phenix_adaptors.sad_target
 from cctbx.array_family import flex
 from cctbx import xray
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from libtbx.utils import Sorry, user_plus_sys_time
 from cctbx.eltbx.xray_scattering import wk1995
 from cctbx import adptbx
 from libtbx import adopt_init_args
 
 
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 
 time_bulk_solvent_and_scale         = 0.0
 time_mask                           = 0.0
diff --git a/mmtbx/regression/tncs/tst_epsfac_and_radius.py b/mmtbx/regression/tncs/tst_epsfac_and_radius.py
index 983fcc3278..449816044a 100644
--- a/mmtbx/regression/tncs/tst_epsfac_and_radius.py
+++ b/mmtbx/regression/tncs/tst_epsfac_and_radius.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_ncs_ext")
 import iotbx.pdb
 from mmtbx.ncs import tncs
 import libtbx.load_env
diff --git a/mmtbx/regression/tncs/tst_fd.py b/mmtbx/regression/tncs/tst_fd.py
index 1250e88fd7..d8ae772f89 100644
--- a/mmtbx/regression/tncs/tst_fd.py
+++ b/mmtbx/regression/tncs/tst_fd.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_ncs_ext")
 import iotbx.pdb
 from scitbx.array_family import flex
 from mmtbx.ncs import tncs
diff --git a/mmtbx/regression/tncs/tst_moments.py b/mmtbx/regression/tncs/tst_moments.py
index 9306e7644b..2d6af28446 100644
--- a/mmtbx/regression/tncs/tst_moments.py
+++ b/mmtbx/regression/tncs/tst_moments.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_ncs_ext")
 import iotbx.pdb
 from mmtbx.ncs import tncs
 import libtbx.load_env
diff --git a/mmtbx/regression/tncs/tst_pair.py b/mmtbx/regression/tncs/tst_pair.py
index 49ec6b77b1..4fc17fed42 100644
--- a/mmtbx/regression/tncs/tst_pair.py
+++ b/mmtbx/regression/tncs/tst_pair.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_ncs_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_ncs_ext")
 from mmtbx_ncs_ext import *
 from libtbx.test_utils import approx_equal
 
diff --git a/mmtbx/rotamer/ramachandran_eval.py b/mmtbx/rotamer/ramachandran_eval.py
index 07fc3e5de9..c043a83a22 100644
--- a/mmtbx/rotamer/ramachandran_eval.py
+++ b/mmtbx/rotamer/ramachandran_eval.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 
 # maps programatic name to file name
diff --git a/mmtbx/rsr/__init__.py b/mmtbx/rsr/__init__.py
index b80621c623..d94fb3d6cf 100644
--- a/mmtbx/rsr/__init__.py
+++ b/mmtbx/rsr/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_rsr_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_rsr_ext")
 from mmtbx_rsr_ext import *
diff --git a/mmtbx/scaling/__init__.py b/mmtbx/scaling/__init__.py
index 04ce907080..ea717f3d9e 100644
--- a/mmtbx/scaling/__init__.py
+++ b/mmtbx/scaling/__init__.py
@@ -12,9 +12,9 @@
 from six.moves import cStringIO as StringIO
 import sys
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_scaling_ext")
+ext = bp.import_ext("mmtbx_scaling_ext")
 from mmtbx_scaling_ext import *
 
 
diff --git a/mmtbx/secondary_structure/dssp.py b/mmtbx/secondary_structure/dssp.py
index 54a602c122..dd8eade42d 100644
--- a/mmtbx/secondary_structure/dssp.py
+++ b/mmtbx/secondary_structure/dssp.py
@@ -458,8 +458,8 @@ def find_nearby_backbone_n(self, o_atom):
     return n_atoms
 
   def process_o_n_interaction(self, o_atom, n_atom):
-    import boost_adaptbx.python
-    ext = boost_adaptbx.python.import_ext("mmtbx_dssp_ext")
+    import boost_adaptbx.boost.python as bp
+    ext = bp.import_ext("mmtbx_dssp_ext")
     energy = ext.get_o_n_hbond_energy(O=o_atom, N=n_atom)
     # TODO incorporate angle filtering - need to ask Jane and/or look at
     # Reduce source code for ideas
diff --git a/mmtbx/secondary_structure/ss_validation.py b/mmtbx/secondary_structure/ss_validation.py
index 8aeae849d5..fd72eb00a4 100644
--- a/mmtbx/secondary_structure/ss_validation.py
+++ b/mmtbx/secondary_structure/ss_validation.py
@@ -11,9 +11,9 @@
 from mmtbx.building.loop_closure.utils import get_phi_psi_atoms, get_pair_angles
 from libtbx import group_args
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
-ext = boost_adaptbx.python.import_ext("mmtbx_validation_ramachandran_ext")
+ext = bp.import_ext("mmtbx_validation_ramachandran_ext")
 from mmtbx_validation_ramachandran_ext import rama_eval
 from mmtbx.validation import ramalyze
 from phenix.pdb_tools.phi_psi_2_data import phi_psi_2_mask_class
diff --git a/mmtbx/solvent/__init__.py b/mmtbx/solvent/__init__.py
index 005b32428e..b6870dc23e 100644
--- a/mmtbx/solvent/__init__.py
+++ b/mmtbx/solvent/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_bulk_solvent_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_bulk_solvent_ext")
 from mmtbx_bulk_solvent_ext import *
diff --git a/mmtbx/solvent/map_to_water.py b/mmtbx/solvent/map_to_water.py
index ba72ab2541..07dc0db8af 100644
--- a/mmtbx/solvent/map_to_water.py
+++ b/mmtbx/solvent/map_to_water.py
@@ -3,8 +3,8 @@
 import iotbx.pdb
 import mmtbx.model
 import iotbx.mrcfile
-import boost_adaptbx.python
-cctbx_maptbx_ext = boost_adaptbx.python.import_ext("cctbx_maptbx_ext")
+import boost_adaptbx.boost.python as bp
+cctbx_maptbx_ext = bp.import_ext("cctbx_maptbx_ext")
 import time
 from cctbx import maptbx
 from libtbx import adopt_init_args
diff --git a/mmtbx/tls/__init__.py b/mmtbx/tls/__init__.py
index 5f80feb50c..fbc17666e9 100644
--- a/mmtbx/tls/__init__.py
+++ b/mmtbx/tls/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import cctbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_tls_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_tls_ext")
 from mmtbx_tls_ext import *
diff --git a/mmtbx/tls/decompose.py b/mmtbx/tls/decompose.py
index 3a1d687c41..2b11063e43 100644
--- a/mmtbx/tls/decompose.py
+++ b/mmtbx/tls/decompose.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_tls_decompose_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_tls_decompose_ext")
 from mmtbx_tls_decompose_ext import *
diff --git a/mmtbx/tls/optimise_amplitudes.py b/mmtbx/tls/optimise_amplitudes.py
index 50ce38c145..1b418cea60 100644
--- a/mmtbx/tls/optimise_amplitudes.py
+++ b/mmtbx/tls/optimise_amplitudes.py
@@ -4,8 +4,8 @@
 import scitbx.array_family.flex
 import scitbx.lbfgs
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("mmtbx_tls_optimise_amplitudes_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("mmtbx_tls_optimise_amplitudes_ext")
 from mmtbx_tls_optimise_amplitudes_ext import *
 
 from libtbx import adopt_init_args
@@ -143,4 +143,3 @@ def run(self):
     self.result.set_selected(self.result < 0.0, 0.0) # Report this!?!
 
     return self
-
diff --git a/mmtbx/tls/utils.py b/mmtbx/tls/utils.py
index 990971f045..b35368cccc 100644
--- a/mmtbx/tls/utils.py
+++ b/mmtbx/tls/utils.py
@@ -4,9 +4,9 @@
 import scitbx.array_family.flex # import dependency
 from mmtbx.tls.decompose import decompose_tls_matrices # import dependency
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("mmtbx_tls_utils_ext")
+ext = bp.import_ext("mmtbx_tls_utils_ext")
 from mmtbx_tls_utils_ext import *
 
 def _indexing__iter__(self):
diff --git a/mmtbx/utils/__init__.py b/mmtbx/utils/__init__.py
index a7095c70c8..b801dd9211 100644
--- a/mmtbx/utils/__init__.py
+++ b/mmtbx/utils/__init__.py
@@ -55,15 +55,15 @@
 from iotbx.file_reader import any_file
 from mmtbx.rotamer.rotamer_eval import RotamerEval
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import zip
 from six.moves import range
-utils_ext = boost_adaptbx.python.import_ext("mmtbx_utils_ext")
+utils_ext = bp.import_ext("mmtbx_utils_ext")
 from mmtbx_utils_ext import *
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from mmtbx import bulk_solvent
-ext = boost_adaptbx.python.import_ext("mmtbx_f_model_ext")
+ext = bp.import_ext("mmtbx_f_model_ext")
 
 import mmtbx.rotamer
 
diff --git a/mmtbx/validation/comprehensive_residue.py b/mmtbx/validation/comprehensive_residue.py
index 0c6ced50a1..cbd6fb301c 100644
--- a/mmtbx/validation/comprehensive_residue.py
+++ b/mmtbx/validation/comprehensive_residue.py
@@ -2,11 +2,11 @@
 import iotbx.phil
 from mmtbx.validation import ramalyze
 from mmtbx.validation import rotalyze
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 from six.moves import range
 
-ext = boost_adaptbx.python.import_ext("mmtbx_ramachandran_restraints_ext")
+ext = bp.import_ext("mmtbx_ramachandran_restraints_ext")
 
 def get_master_phil():
   return iotbx.phil.parse(input_string="""
diff --git a/omptbx/__init__.py b/omptbx/__init__.py
index 7ceb616be0..f199e60f8d 100644
--- a/omptbx/__init__.py
+++ b/omptbx/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("omptbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("omptbx_ext")
 from omptbx_ext import *
 
 import libtbx.introspection
diff --git a/prime/__init__.py b/prime/__init__.py
index 1da5ba811e..564cbadf27 100644
--- a/prime/__init__.py
+++ b/prime/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("prime_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("prime_ext")
 from prime_ext import *
 
 prime_description = ''' The Post-RefInement and MErging (PRIME) program for
diff --git a/prime/index_ambiguity/__init__.py b/prime/index_ambiguity/__init__.py
index cd8eef2ac0..abbc81f5dc 100644
--- a/prime/index_ambiguity/__init__.py
+++ b/prime/index_ambiguity/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("prime_index_ambiguity_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("prime_index_ambiguity_ext")
 from prime_index_ambiguity_ext import *
diff --git a/rstbx/__init__.py b/rstbx/__init__.py
index 5245ca0cf3..1ebd4057fd 100644
--- a/rstbx/__init__.py
+++ b/rstbx/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("omptbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("omptbx_ext")
 from omptbx_ext import *
diff --git a/rstbx/apps/__init__.py b/rstbx/apps/__init__.py
index c44b632afe..3cbd3f6885 100644
--- a/rstbx/apps/__init__.py
+++ b/rstbx/apps/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex # import dependency
 from annlib_ext import AnnAdaptor # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_integration_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_integration_ext")
 from rstbx_integration_ext import *
diff --git a/rstbx/array_family/flex.py b/rstbx/array_family/flex.py
index c9e3edc676..654c7efbde 100644
--- a/rstbx/array_family/flex.py
+++ b/rstbx/array_family/flex.py
@@ -2,8 +2,8 @@
 import scitbx.array_family.flex
 import cctbx.array_family.flex
 
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("cctbx_array_family_flex_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("cctbx_array_family_flex_ext")
 from scitbx_array_family_flex_ext import *
 from cctbx_array_family_flex_ext import *
 from rstbx_array_family_flex_ext import *
diff --git a/rstbx/bandpass/__init__.py b/rstbx/bandpass/__init__.py
index 8e31230259..18de94e1b2 100644
--- a/rstbx/bandpass/__init__.py
+++ b/rstbx/bandpass/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_bandpass_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_bandpass_ext")
 from rstbx_bandpass_ext import *
diff --git a/rstbx/bpcx/__init__.py b/rstbx/bpcx/__init__.py
index 160bdc4022..ba27ead449 100644
--- a/rstbx/bpcx/__init__.py
+++ b/rstbx/bpcx/__init__.py
@@ -4,6 +4,6 @@
 # from rstbx.bpcx import sensor
 
 from cctbx.array_family import flex # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_bpcx_detector_model_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_bpcx_detector_model_ext")
 from rstbx_bpcx_detector_model_ext import *
diff --git a/rstbx/diffraction/__init__.py b/rstbx/diffraction/__init__.py
index ac49c9b1db..a4a2ff106e 100644
--- a/rstbx/diffraction/__init__.py
+++ b/rstbx/diffraction/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from cctbx.array_family import flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_ext")
 from rstbx_ext import *
diff --git a/rstbx/diffraction/fastbragg/__init__.py b/rstbx/diffraction/fastbragg/__init__.py
index b4a0d61477..b59f2dbe64 100644
--- a/rstbx/diffraction/fastbragg/__init__.py
+++ b/rstbx/diffraction/fastbragg/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_diffraction_fastbragg_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_diffraction_fastbragg_ext")
 from rstbx_diffraction_fastbragg_ext import *
 
-@boost_adaptbx.python.inject_into(ext.detector)
+@bp.inject_into(ext.detector)
 class _():
 
   def show(self):
diff --git a/rstbx/dps_core/__init__.py b/rstbx/dps_core/__init__.py
index f8db3c76b0..626b888e27 100644
--- a/rstbx/dps_core/__init__.py
+++ b/rstbx/dps_core/__init__.py
@@ -2,8 +2,8 @@
 from six.moves import range
 from cctbx.array_family import flex # import dependency
 
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("rstbx_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("rstbx_ext")
 from rstbx_ext import *
 import rstbx_ext as ext
 
@@ -12,7 +12,7 @@
 from cctbx.crystal_orientation import basis_type
 from cctbx.crystal_orientation import ext as coext
 
-@boost_adaptbx.python.inject_into(coext.crystal_orientation)
+@bp.inject_into(coext.crystal_orientation)
 class _():
 
   def constrain(self,constraints):
@@ -76,7 +76,7 @@ def directional_show(direction,message):
     direction.real,180*direction.psi/math.pi, 180.*direction.phi/math.pi,
     direction.kmax, direction.kval,direction.kval2,direction.kval3))
 
-@boost_adaptbx.python.inject_into(ext.dps_core)
+@bp.inject_into(ext.dps_core)
 class _():
 
   def combos(self,basis=10):
diff --git a/rstbx/indexing_api/__init__.py b/rstbx/indexing_api/__init__.py
index 8feedc0242..31b1331a01 100644
--- a/rstbx/indexing_api/__init__.py
+++ b/rstbx/indexing_api/__init__.py
@@ -1,15 +1,15 @@
 from __future__ import absolute_import, division, print_function
 from six.moves import range
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import rstbx.dps_core # import dependency
-boost_adaptbx.python.import_ext("rstbx_indexing_api_ext")
+bp.import_ext("rstbx_indexing_api_ext")
 from rstbx_indexing_api_ext import *
 import rstbx_indexing_api_ext as ext
 from rstbx.array_family import flex
 from scitbx.matrix import col
 from rstbx_ext import * # gets us SpotClass
 
-@boost_adaptbx.python.inject_into(ext.dps_extended)
+@bp.inject_into(ext.dps_extended)
 class _():
 
   def set_beam_vector(self,beam):
diff --git a/rstbx/indexing_api/lattice.py b/rstbx/indexing_api/lattice.py
index 4926056838..bd5ebd2bf4 100644
--- a/rstbx/indexing_api/lattice.py
+++ b/rstbx/indexing_api/lattice.py
@@ -7,9 +7,9 @@
 import math,cmath
 from scitbx import matrix
 from libtbx.test_utils import approx_equal
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 
-@boost_adaptbx.python.inject_into(dps_extended)
+@bp.inject_into(dps_extended)
 class _():
 
   def index(self, raw_spot_input=None, reciprocal_space_vectors=None,
diff --git a/rstbx/simage/__init__.py b/rstbx/simage/__init__.py
index b689a82b53..b015464ff9 100644
--- a/rstbx/simage/__init__.py
+++ b/rstbx/simage/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_simage_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_simage_ext")
 from rstbx_simage_ext import *
diff --git a/rstbx/simulation/__init__.py b/rstbx/simulation/__init__.py
index bf3d89d883..ad5fef5aa3 100644
--- a/rstbx/simulation/__init__.py
+++ b/rstbx/simulation/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_simulation_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_simulation_ext")
 from rstbx_simulation_ext import *
 from scitbx import matrix
 from cctbx import crystal_orientation
diff --git a/rstbx/symmetry/constraints/__init__.py b/rstbx/symmetry/constraints/__init__.py
index 9556025334..7e3b83b391 100644
--- a/rstbx/symmetry/constraints/__init__.py
+++ b/rstbx/symmetry/constraints/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("rstbx_symmetry_constraints_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("rstbx_symmetry_constraints_ext")
 from rstbx_symmetry_constraints_ext import *
diff --git a/scitbx/array_family/flex.py b/scitbx/array_family/flex.py
index a41cf40760..c51930154a 100644
--- a/scitbx/array_family/flex.py
+++ b/scitbx/array_family/flex.py
@@ -4,12 +4,12 @@
 import six
 import sys
 
-import boost_adaptbx.optional # import dependency
-import boost_adaptbx.std_pair # import dependency
-import boost_adaptbx.python
+import boost_adaptbx.boost.optional # import dependency
+import boost_adaptbx.boost.std_pair # import dependency
+import boost_adaptbx.boost.python as bp
 from six.moves import range
 from six.moves import zip
-boost_adaptbx.python.import_ext("scitbx_array_family_flex_ext")
+bp.import_ext("scitbx_array_family_flex_ext")
 from scitbx_array_family_flex_ext import *
 import scitbx_array_family_flex_ext as ext
 
@@ -41,7 +41,7 @@ def bool_md5(self):
   return hashlib.md5(self.__getstate__()[1])
 bool.md5 = bool_md5
 
-@boost_adaptbx.python.inject_into(grid)
+@bp.inject_into(grid)
 class _():
 
   def show_summary(self, f=None):
@@ -163,7 +163,7 @@ def _format_mean(values, format):
   return format_value(
     format=format, value=mean_default(values=values, default=None))
 
-@boost_adaptbx.python.inject_into(ext.min_max_mean_double)
+@bp.inject_into(ext.min_max_mean_double)
 class _():
 
   def show(self, out=None, prefix="", format="%.6g", show_n=True):
@@ -232,7 +232,7 @@ def store_range():
   store_range()
   return result
 
-@boost_adaptbx.python.inject_into(mersenne_twister)
+@bp.inject_into(mersenne_twister)
 class _():
 
   def random_selection(self, population_size, sample_size):
@@ -291,7 +291,7 @@ def __getitem__(self, index):
   def __setitem__(self, index, value):
     self._data[self._accessor(index)] = value
 
-@boost_adaptbx.python.inject_into(ext.linear_regression_core)
+@bp.inject_into(ext.linear_regression_core)
 class _():
 
   def show_summary(self, f=None, prefix=""):
@@ -300,7 +300,7 @@ def show_summary(self, f=None, prefix=""):
     print(prefix+"y_intercept:", self.y_intercept(), file=f)
     print(prefix+"slope:", self.slope(), file=f)
 
-@boost_adaptbx.python.inject_into(ext.double)
+@bp.inject_into(ext.double)
 class _():
 
   def matrix_inversion(self):
@@ -311,7 +311,7 @@ def matrix_inversion(self):
   def as_scitbx_matrix(self):
     return as_scitbx_matrix(self)
 
-@boost_adaptbx.python.inject_into(ext.linear_correlation)
+@bp.inject_into(ext.linear_correlation)
 class _():
 
   def show_summary(self, f=None, prefix=""):
@@ -331,7 +331,7 @@ def __init__(self, low_cutoff, high_cutoff, n):
   def center(self):
     return (self.high_cutoff + self.low_cutoff) / 2
 
-@boost_adaptbx.python.inject_into(ext.histogram)
+@bp.inject_into(ext.histogram)
 class _():
 
   def __getinitargs__(self):
@@ -402,7 +402,7 @@ def __init__(self, low_cutoff, high_cutoff, n):
   def center(self):
     return (self.high_cutoff + self.low_cutoff) / 2
 
-@boost_adaptbx.python.inject_into(ext.weighted_histogram)
+@bp.inject_into(ext.weighted_histogram)
 class _():
 
   def __getinitargs__(self):
diff --git a/scitbx/array_family/shared.py b/scitbx/array_family/shared.py
index a6fcd60831..6adae01ceb 100644
--- a/scitbx/array_family/shared.py
+++ b/scitbx/array_family/shared.py
@@ -1,14 +1,14 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.stl.vector # import dependency
 
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("scitbx_array_family_shared_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("scitbx_array_family_shared_ext")
 from scitbx_array_family_shared_ext import *
 import scitbx_array_family_shared_ext as ext
 
 class pickle_import_trigger(object): pass
 
-@boost_adaptbx.python.inject_into(ext.stl_set_unsigned)
+@bp.inject_into(ext.stl_set_unsigned)
 class _():
 
   def __getstate__(self): # XXX slow, move to C++
diff --git a/scitbx/cubicle_neighbors.py b/scitbx/cubicle_neighbors.py
index e8f40b949e..e4ce1b23df 100644
--- a/scitbx/cubicle_neighbors.py
+++ b/scitbx/cubicle_neighbors.py
@@ -2,15 +2,15 @@
 import scitbx.array_family.flex # import dependency
 import scitbx.stl.map # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_cubicle_neighbors_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_cubicle_neighbors_ext")
 from scitbx_cubicle_neighbors_ext import *
 
 def __cubicles_max_memory_allocation_set():
   from libtbx.introspection import machine_memory_info
   m = machine_memory_info().memory_total()
   if (m is None): m = 1000000000
-  l = 2**(8*boost_adaptbx.python.sizeof_void_ptr-1)-1
+  l = 2**(8*bp.sizeof_void_ptr-1)-1
   if (m > l): m = l
   cubicles_max_memory_allocation_set(number_of_bytes=m//2)
 __cubicles_max_memory_allocation_set()
diff --git a/scitbx/examples/bevington/__init__.py b/scitbx/examples/bevington/__init__.py
index 8884bab97e..37f23276fe 100644
--- a/scitbx/examples/bevington/__init__.py
+++ b/scitbx/examples/bevington/__init__.py
@@ -1,11 +1,11 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.lstbx import normal_eqns # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_examples_bevington_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_examples_bevington_ext")
 from scitbx_examples_bevington_ext import *
 
 #inject python method into non_linear_ls_eigen_wrapper
-@boost_adaptbx.python.inject_into(ext.non_linear_ls_eigen_wrapper)
+@bp.inject_into(ext.non_linear_ls_eigen_wrapper)
 class _():
 
   def get_eigen_summary(self): # ported from c++ code to encapsulate printing
diff --git a/scitbx/fftpack.py b/scitbx/fftpack.py
index 36069b02da..139495eb12 100644
--- a/scitbx/fftpack.py
+++ b/scitbx/fftpack.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_fftpack_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_fftpack_ext")
 from scitbx_fftpack_ext import *
diff --git a/scitbx/graphics_utils/__init__.py b/scitbx/graphics_utils/__init__.py
index d578956e5f..a32985a666 100644
--- a/scitbx/graphics_utils/__init__.py
+++ b/scitbx/graphics_utils/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_graphics_utils_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_graphics_utils_ext")
 from scitbx_graphics_utils_ext import *
 from cctbx.array_family import flex
 
diff --git a/scitbx/iso_surface/__init__.py b/scitbx/iso_surface/__init__.py
index 619b5d472f..f133887805 100644
--- a/scitbx/iso_surface/__init__.py
+++ b/scitbx/iso_surface/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_iso_surface_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_iso_surface_ext")
 import scitbx_iso_surface_ext
 # the following is essential to load the binding
 # of af::shared<tiny<size_t, 3> >
diff --git a/scitbx/lbfgs/__init__.py b/scitbx/lbfgs/__init__.py
index 7afad6f022..f45c898e36 100644
--- a/scitbx/lbfgs/__init__.py
+++ b/scitbx/lbfgs/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_lbfgs_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_lbfgs_ext")
 from scitbx_lbfgs_ext import *
 
 from libtbx import adopt_init_args
diff --git a/scitbx/lbfgsb.py b/scitbx/lbfgsb.py
index 87d32bf58d..4295eca7ae 100644
--- a/scitbx/lbfgsb.py
+++ b/scitbx/lbfgsb.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.array_family.flex
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_lbfgsb_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_lbfgsb_ext")
 from scitbx_lbfgsb_ext import *
 
 from scitbx.array_family import flex
diff --git a/scitbx/linalg/ext.py b/scitbx/linalg/ext.py
index 808c9b6558..6bf253b295 100644
--- a/scitbx/linalg/ext.py
+++ b/scitbx/linalg/ext.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("scitbx_linalg_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("scitbx_linalg_ext")
 from scitbx_linalg_ext import *
diff --git a/scitbx/lstbx/normal_eqns.py b/scitbx/lstbx/normal_eqns.py
index 46c9f41ea3..6ce59a0539 100644
--- a/scitbx/lstbx/normal_eqns.py
+++ b/scitbx/lstbx/normal_eqns.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 import libtbx.load_env
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("scitbx_lstbx_normal_equations_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("scitbx_lstbx_normal_equations_ext")
 import scitbx_lstbx_normal_equations_ext as ext
 from scitbx_lstbx_normal_equations_ext import *
 
@@ -55,7 +55,7 @@ def solve_and_step_forward(self):
   def step(self):
     return self.step_equations().solution()
 
-@boost_adaptbx.python.inject_into(linear_ls)
+@bp.inject_into(linear_ls)
 class _():
 
   def __iter__(self):
diff --git a/scitbx/math/__init__.py b/scitbx/math/__init__.py
index 7cad57e047..9a357b6164 100644
--- a/scitbx/math/__init__.py
+++ b/scitbx/math/__init__.py
@@ -9,7 +9,7 @@
 import scitbx.math.gaussian # implicit import
 from scitbx import matrix
 from scitbx.array_family import flex
-from boost_adaptbx import rational # implicit import
+from boost_adaptbx.boost import rational # implicit import
 from six.moves import range
 from six.moves import zip
 
diff --git a/scitbx/math/distributions.py b/scitbx/math/distributions.py
index 0038d580c3..476e4914ab 100644
--- a/scitbx/math/distributions.py
+++ b/scitbx/math/distributions.py
@@ -8,7 +8,7 @@
   class students_t_distribution(object):
     def __init__(self, *args, **keyword_args):
       raise RuntimeError("Implementation not available in this build.")
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 
 class __distribution_mixin(object):
 
@@ -45,7 +45,7 @@ def quantile(self, p):
   def quantiles(self, n):
     return ext.quantiles(self, n)
 
-boost_adaptbx.python.inject(normal_distribution, __distribution_mixin)
+bp.inject(normal_distribution, __distribution_mixin)
 
 if (hasattr(ext, "students_t_distribution")):
-  boost_adaptbx.python.inject(students_t_distribution, __distribution_mixin)
+  bp.inject(students_t_distribution, __distribution_mixin)
diff --git a/scitbx/math/ext.py b/scitbx/math/ext.py
index 3c7b022f40..8973a2f0dc 100644
--- a/scitbx/math/ext.py
+++ b/scitbx/math/ext.py
@@ -2,13 +2,13 @@
 import scitbx.array_family.flex # import dependency
 import scitbx.array_family.shared # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_math_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_math_ext")
 from scitbx_math_ext import *
 
 import sys
 
-@boost_adaptbx.python.inject_into(ext.basic_statistics)
+@bp.inject_into(ext.basic_statistics)
 class _():
 
   def show(self, f=None, prefix=""):
@@ -34,7 +34,7 @@ def show(self, f=None, prefix=""):
         print(prefix+"kurtosis:", self.kurtosis, file=f)
         print(prefix+"kurtosis_excess:", self.kurtosis_excess, file=f)
 
-@boost_adaptbx.python.inject_into(ext.line_search_more_thuente_1994)
+@bp.inject_into(ext.line_search_more_thuente_1994)
 class _():
 
   def show_status(self, f=None, prefix=""):
@@ -50,7 +50,7 @@ def show_status(self, f=None, prefix=""):
     print(prefix+"stp:", self.stp, file=f)
     print(prefix+"nfev:", self.nfev, file=f)
 
-@boost_adaptbx.python.inject_into(ext.unimodular_generator)
+@bp.inject_into(ext.unimodular_generator)
 class _():
 
   def all(self):
diff --git a/scitbx/math/gaussian.py b/scitbx/math/gaussian.py
index 44c37fe340..cf9f608bec 100644
--- a/scitbx/math/gaussian.py
+++ b/scitbx/math/gaussian.py
@@ -6,11 +6,11 @@
 from scitbx.math.ext import gaussian_fit as fit
 from scitbx.array_family import flex
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import sys
 from six.moves import zip
 
-@boost_adaptbx.python.inject_into(sum)
+@bp.inject_into(sum)
 class _():
 
   def show(self, f=None, format=None):
@@ -32,7 +32,7 @@ def sort(self):
       self.c(),
       self.use_c())
 
-@boost_adaptbx.python.inject_into(fit)
+@bp.inject_into(fit)
 class _():
 
   def show_table(self, f=None):
diff --git a/scitbx/math/tests/tst_gcd.py b/scitbx/math/tests/tst_gcd.py
index bb7740c4f8..1528bb159d 100644
--- a/scitbx/math/tests/tst_gcd.py
+++ b/scitbx/math/tests/tst_gcd.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.math
-import boost_adaptbx.rational
+import boost_adaptbx.boost.rational
 import time
 import sys, os
 from six.moves import range
@@ -15,7 +15,7 @@ def compare_with_boost_rational_gcd(label):
           + list(range( 100000-10, 100000+11))
   for a in samples:
     for b in samples:
-      r = boost_adaptbx.rational.gcd(a, b)
+      r = boost_adaptbx.boost.rational.gcd(a, b)
       o = other_gcd(a=a, b=b)
       if (o != r):
         raise RuntimeError(str((a, b, r, o)))
diff --git a/scitbx/math/tests/tst_math.py b/scitbx/math/tests/tst_math.py
index 547570e769..effd351f55 100644
--- a/scitbx/math/tests/tst_math.py
+++ b/scitbx/math/tests/tst_math.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.math
-import boost_adaptbx.rational
+import boost_adaptbx.boost.rational
 from scitbx.math import line_given_points
 from scitbx.math import dihedral_angle
 from scitbx.math import euler_angles_as_matrix
@@ -1801,7 +1801,7 @@ def distance(n,d):
 
 def exercise_continued_fraction():
   continued_fraction = scitbx.math.continued_fraction
-  frac = boost_adaptbx.rational.int
+  frac = boost_adaptbx.boost.rational.int
   cf = continued_fraction(1)
   assert cf.as_rational() == frac(1,1)
   cf.append(1)
diff --git a/scitbx/matrix/__init__.py b/scitbx/matrix/__init__.py
index 3d2ad1b448..a5b996eddf 100644
--- a/scitbx/matrix/__init__.py
+++ b/scitbx/matrix/__init__.py
@@ -172,7 +172,7 @@ def as_float(self):
     return rec([float(e) for e in self.elems], self.n)
 
   def as_boost_rational(self):
-    from boost_adaptbx import rational
+    from boost_adaptbx.boost import rational
     return rec([rational.int(e) for e in self.elems], self.n)
 
   def as_int(self, rounding=True):
@@ -1493,7 +1493,7 @@ def approx_equal(a, b): return True
     assert isinstance(gv, flex.vec3_double)
     assert approx_equal(gv, [(441, 1063, 1685), (333, 802, 1271)])
   #
-  try: from boost_adaptbx import rational
+  try: from boost_adaptbx.boost import rational
   except ImportError: pass
   else:
     assert approx_equal(col((rational.int(3,4),2,1.5)).as_float(),(0.75,2,1.5))
diff --git a/scitbx/matrix/tests/tst_row_echelon.py b/scitbx/matrix/tests/tst_row_echelon.py
index 5e324b39e5..bd3376f526 100644
--- a/scitbx/matrix/tests/tst_row_echelon.py
+++ b/scitbx/matrix/tests/tst_row_echelon.py
@@ -4,7 +4,7 @@ def exercise_rational():
   from scitbx.matrix import row_echelon
   from scitbx import matrix
   from libtbx.utils import flat_list
-  from boost_adaptbx import rational
+  from boost_adaptbx.boost import rational
   import random
   rng = random.Random(0)
   #
diff --git a/scitbx/minpack.py b/scitbx/minpack.py
index 9cf7f2c362..77463b08e0 100644
--- a/scitbx/minpack.py
+++ b/scitbx/minpack.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_minpack_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_minpack_ext")
 from scitbx_minpack_ext import *
diff --git a/scitbx/r3_utils.py b/scitbx/r3_utils.py
index 4cabfd24c5..e9aeaa0cfe 100644
--- a/scitbx/r3_utils.py
+++ b/scitbx/r3_utils.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.array_family import flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_r3_utils_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_r3_utils_ext")
 from scitbx_r3_utils_ext import *
diff --git a/scitbx/random/__init__.py b/scitbx/random/__init__.py
index 9fe4a58496..55eb309860 100644
--- a/scitbx/random/__init__.py
+++ b/scitbx/random/__init__.py
@@ -3,9 +3,9 @@
 import os
 import time
 
-import boost_adaptbx.optional # import dependency
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("scitbx_random_ext")
+import boost_adaptbx.boost.optional # import dependency
+import boost_adaptbx.boost.python as bp
+bp.import_ext("scitbx_random_ext")
 import scitbx_random_ext
 
 def get_random_seed():
diff --git a/scitbx/rigid_body/__init__.py b/scitbx/rigid_body/__init__.py
index d1158a8b37..192b91666e 100644
--- a/scitbx/rigid_body/__init__.py
+++ b/scitbx/rigid_body/__init__.py
@@ -1,15 +1,15 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.array_family.flex # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_rigid_body_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_rigid_body_ext")
 from scitbx_rigid_body_ext import *
 import math
 from scitbx import matrix
 
 class pickle_import_trigger(object): pass
 
-@boost_adaptbx.python.inject_into(ext.tardy_model)
+@bp.inject_into(ext.tardy_model)
 class _():
 
   def __getinitargs__(O):
diff --git a/scitbx/sparse/__init__.py b/scitbx/sparse/__init__.py
index 7d0bf8f88d..ee700b8a5c 100644
--- a/scitbx/sparse/__init__.py
+++ b/scitbx/sparse/__init__.py
@@ -1,16 +1,16 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-import boost_adaptbx.optional # import dependency
+import boost_adaptbx.boost.python as bp
+import boost_adaptbx.boost.optional # import dependency
 from six.moves import range
 # Indeed Boost.Python binding needs boost::optional
 # through scitbx/random/boost_python/random.h
-ext = boost_adaptbx.python.import_ext("scitbx_sparse_ext")
+ext = bp.import_ext("scitbx_sparse_ext")
 from scitbx_sparse_ext import *
 from scitbx.array_family import flex
 import scitbx.random
 scitbx.random.variate.register_module(ext)
 
-@boost_adaptbx.python.inject_into(matrix)
+@bp.inject_into(matrix)
 class _():
 
   def cols(self):
diff --git a/scitbx/stl/map.py b/scitbx/stl/map.py
index 23357a5b42..f65a656cb6 100644
--- a/scitbx/stl/map.py
+++ b/scitbx/stl/map.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.stl.vector # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_stl_map_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_stl_map_ext")
 from scitbx_stl_map_ext import *
diff --git a/scitbx/stl/set.py b/scitbx/stl/set.py
index 4053957eaa..cdc5cf6b45 100644
--- a/scitbx/stl/set.py
+++ b/scitbx/stl/set.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_stl_set_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_stl_set_ext")
 from scitbx_stl_set_ext import *
diff --git a/scitbx/stl/vector.py b/scitbx/stl/vector.py
index 711ed69a46..d226af3f6e 100644
--- a/scitbx/stl/vector.py
+++ b/scitbx/stl/vector.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.stl.set # import dependency
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("scitbx_stl_vector_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("scitbx_stl_vector_ext")
 from scitbx_stl_vector_ext import *
diff --git a/scitbx/suffixtree/__init__.py b/scitbx/suffixtree/__init__.py
index ab1b55433c..55655652df 100644
--- a/scitbx/suffixtree/__init__.py
+++ b/scitbx/suffixtree/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from functools import reduce
 from six.moves import range
-ext = boost_adaptbx.python.import_ext( "scitbx_suffixtree_shared_ext" )
+ext = bp.import_ext( "scitbx_suffixtree_shared_ext" )
 from scitbx_suffixtree_shared_ext import *
 
 def dump(root, word):
diff --git a/scitbx/suffixtree/single.py b/scitbx/suffixtree/single.py
index 71182e3034..f725fe7163 100644
--- a/scitbx/suffixtree/single.py
+++ b/scitbx/suffixtree/single.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext( "scitbx_suffixtree_single_ext" )
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext( "scitbx_suffixtree_single_ext" )
 from scitbx_suffixtree_single_ext import *
diff --git a/scitbx/wigner/__init__.py b/scitbx/wigner/__init__.py
index 791d96941b..f4266606c9 100644
--- a/scitbx/wigner/__init__.py
+++ b/scitbx/wigner/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("scitbx_wigner_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("scitbx_wigner_ext")
 from scitbx_wigner_ext import *
diff --git a/simtbx/nanoBragg/__init__.py b/simtbx/nanoBragg/__init__.py
index 3662a28f41..099c91a1b7 100644
--- a/simtbx/nanoBragg/__init__.py
+++ b/simtbx/nanoBragg/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 import cctbx.uctbx # possibly implicit
-ext = boost_adaptbx.python.import_ext("simtbx_nanoBragg_ext")
+ext = bp.import_ext("simtbx_nanoBragg_ext")
 from scitbx.array_family import flex
 from simtbx_nanoBragg_ext import *
 from scitbx.matrix import col, sqr
@@ -15,7 +15,7 @@
 from dxtbx.format import cbf_writer
 
 
-@boost_adaptbx.python.inject_into(ext.nanoBragg)
+@bp.inject_into(ext.nanoBragg)
 class _():
 
   def __getattr__(self,name):
@@ -100,7 +100,7 @@ def to_smv_format_py(self,fileout,intfile_scale=0.0,debug_x=-1,debug_y=-1,
         ptr += 65536
       outfile.close();
       return
-    from boost_adaptbx.python import streambuf
+    from boost_adaptbx.boost.python import streambuf
     self.to_smv_format_streambuf(streambuf(outfile),intfile_scale,debug_x,debug_y)
 
     outfile.close();
diff --git a/smtbx/ab_initio/__init__.py b/smtbx/ab_initio/__init__.py
index bdfc3f2e55..18dbff717f 100644
--- a/smtbx/ab_initio/__init__.py
+++ b/smtbx/ab_initio/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("smtbx_ab_initio_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("smtbx_ab_initio_ext")
 import smtbx_ab_initio_ext as ext
diff --git a/smtbx/array_family/__init__.py b/smtbx/array_family/__init__.py
index bcc92ba4b0..4291f3536a 100644
--- a/smtbx/array_family/__init__.py
+++ b/smtbx/array_family/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("smtbx_array_family_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("smtbx_array_family_ext")
 from smtbx_array_family_ext import *
diff --git a/smtbx/refinement/constraints/__init__.py b/smtbx/refinement/constraints/__init__.py
index 545c04f631..b3d270268b 100644
--- a/smtbx/refinement/constraints/__init__.py
+++ b/smtbx/refinement/constraints/__init__.py
@@ -2,9 +2,9 @@
 
 import warnings
 
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("smtbx_refinement_constraints_ext")
+ext = bp.import_ext("smtbx_refinement_constraints_ext")
 from smtbx_refinement_constraints_ext import *
 
 import scitbx.sparse # import dependency
@@ -40,7 +40,7 @@ def __str__(self):
 bad_connectivity_msg = "Invalid %s constraint involving %s: bad connectivity"
 
 
-@boost_adaptbx.python.inject_into(ext.parameter)
+@bp.inject_into(ext.parameter)
 class _():
 
   def arguments(self):
@@ -66,7 +66,7 @@ def __str__(self):
       scatt, self.index)
     return lbl
 
-@boost_adaptbx.python.inject_into(ext.reparametrisation)
+@bp.inject_into(ext.reparametrisation)
 class _():
 
   def __str__(self):
diff --git a/smtbx/refinement/least_squares.py b/smtbx/refinement/least_squares.py
index b83fdfc16a..86a573717a 100644
--- a/smtbx/refinement/least_squares.py
+++ b/smtbx/refinement/least_squares.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("smtbx_refinement_least_squares_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("smtbx_refinement_least_squares_ext")
 from smtbx_refinement_least_squares_ext import *
 
 
diff --git a/smtbx/refinement/restraints/__init__.py b/smtbx/refinement/restraints/__init__.py
index 8df4099f1c..6970bff106 100644
--- a/smtbx/refinement/restraints/__init__.py
+++ b/smtbx/refinement/restraints/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import scitbx.sparse # import dependency
 
-import boost_adaptbx.python
-boost_adaptbx.python.import_ext("smtbx_refinement_restraints_ext")
+import boost_adaptbx.boost.python as bp
+bp.import_ext("smtbx_refinement_restraints_ext")
 
 from smtbx_refinement_restraints_ext import *
 
diff --git a/smtbx/refinement/weighting_schemes.py b/smtbx/refinement/weighting_schemes.py
index 36ad3e521e..f0a56d5777 100644
--- a/smtbx/refinement/weighting_schemes.py
+++ b/smtbx/refinement/weighting_schemes.py
@@ -11,9 +11,9 @@
 
 
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
+import boost_adaptbx.boost.python as bp
 from six.moves import range
-ext = boost_adaptbx.python.import_ext("smtbx_refinement_least_squares_ext")
+ext = bp.import_ext("smtbx_refinement_least_squares_ext")
 
 
 from cctbx.array_family import flex
@@ -21,7 +21,7 @@
 import math
 
 
-@boost_adaptbx.python.inject_into(ext.mainstream_shelx_weighting)
+@bp.inject_into(ext.mainstream_shelx_weighting)
 class _():
 
   def __str__(self):
@@ -150,7 +150,7 @@ def compute_chi_sq(fo_sq, fc_sq, a,b):
     weighting.b = start_b
     return weighting
 
-@boost_adaptbx.python.inject_into(ext.unit_weighting)
+@bp.inject_into(ext.unit_weighting)
 class _():
 
   def __str__(self):
@@ -164,7 +164,7 @@ def optimise_parameters(self, fo_sq, fc_sq,
     # no parameters to optimise!
     return self
 
-@boost_adaptbx.python.inject_into(ext.sigma_weighting)
+@bp.inject_into(ext.sigma_weighting)
 class _():
 
   def __str__(self): return "w=1/sigma^2"
diff --git a/smtbx/stl/map.py b/smtbx/stl/map.py
index 222ccd3fe9..7a4666d5b3 100644
--- a/smtbx/stl/map.py
+++ b/smtbx/stl/map.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("smtbx_stl_map_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("smtbx_stl_map_ext")
 from smtbx_stl_map_ext import *
diff --git a/smtbx/structure_factors/direct/__init__.py b/smtbx/structure_factors/direct/__init__.py
index a26e90cf48..84773d0d38 100644
--- a/smtbx/structure_factors/direct/__init__.py
+++ b/smtbx/structure_factors/direct/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("smtbx_structure_factors_direct_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("smtbx_structure_factors_direct_ext")
 
 class constructed_with_xray_structure(object):
 
diff --git a/spotfinder/array_family/flex.py b/spotfinder/array_family/flex.py
index 5ea9fe4e50..9fe0dd99d8 100644
--- a/spotfinder/array_family/flex.py
+++ b/spotfinder/array_family/flex.py
@@ -2,8 +2,8 @@
 import scitbx.array_family.flex
 import cctbx.array_family.flex
 
-import boost_adaptbx.python
-ext_ = boost_adaptbx.python.import_ext("cctbx_array_family_flex_ext")
+import boost_adaptbx.boost.python as bp
+ext_ = bp.import_ext("cctbx_array_family_flex_ext")
 from scitbx_array_family_flex_ext import *
 from cctbx_array_family_flex_ext import *
 from spotfinder_array_family_flex_ext import *
diff --git a/spotfinder/core_toolbox/__init__.py b/spotfinder/core_toolbox/__init__.py
index 1d68b93c80..8d46817f15 100644
--- a/spotfinder/core_toolbox/__init__.py
+++ b/spotfinder/core_toolbox/__init__.py
@@ -2,10 +2,10 @@
 from six.moves import range
 import spotfinder.array_family.flex # implicit import
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("spotfinder_distltbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("spotfinder_distltbx_ext")
 from spotfinder_distltbx_ext import *
-boost_adaptbx.python.import_ext("spotfinder_hough_ext")
+bp.import_ext("spotfinder_hough_ext")
 from spotfinder_hough_ext import *
 from libtbx import adopt_init_args
 from libtbx.utils import Sorry
@@ -158,7 +158,7 @@ def deprecation_warnings(self):
         raise Sorry( """dataset_preferences.py parameters -bx0 -bx1 -bx2 are no longer allowed; found %s.
     Use command line option distl.scanbox_windows=bx0,bx1,bx2 instead with three integer arguments."""%self.options)
 
-@boost_adaptbx.python.inject_into(SpotFilterAgent)
+@bp.inject_into(SpotFilterAgent)
 class _():
   def __getinitargs__(self):
     return (self.pixel_size, self.xbeam, self.ybeam, self.distance,
diff --git a/spotfinder/dxtbx_toolbox/__init__.py b/spotfinder/dxtbx_toolbox/__init__.py
index 09f41478ff..1029c9d2e3 100644
--- a/spotfinder/dxtbx_toolbox/__init__.py
+++ b/spotfinder/dxtbx_toolbox/__init__.py
@@ -2,8 +2,8 @@
 from six.moves import range
 import spotfinder.array_family.flex # implicit import
 
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("spotfinder_dxtbx_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("spotfinder_dxtbx_ext")
 from spotfinder_dxtbx_ext import *
 
 from libtbx import adopt_init_args
diff --git a/xfel/__init__.py b/xfel/__init__.py
index 969b0cdd1b..84d7f82fe6 100644
--- a/xfel/__init__.py
+++ b/xfel/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xfel_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xfel_ext")
 from xfel_ext import *
diff --git a/xfel/clustering/__init__.py b/xfel/clustering/__init__.py
index c19d9f4511..7fcd022ce8 100644
--- a/xfel/clustering/__init__.py
+++ b/xfel/clustering/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("sx_clustering_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("sx_clustering_ext")
 from sx_clustering_ext import *
diff --git a/xfel/merging/__init__.py b/xfel/merging/__init__.py
index 6dcea684aa..14f962a537 100644
--- a/xfel/merging/__init__.py
+++ b/xfel/merging/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("sx_merging_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("sx_merging_ext")
 from sx_merging_ext import *
diff --git a/xfel/merging/algorithms/error_model/__init__.py b/xfel/merging/algorithms/error_model/__init__.py
index 25a14969e4..f24b6dc514 100644
--- a/xfel/merging/algorithms/error_model/__init__.py
+++ b/xfel/merging/algorithms/error_model/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xfel_sdfac_refine_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xfel_sdfac_refine_ext")
 from xfel_sdfac_refine_ext import *
diff --git a/xfel/metrology/__init__.py b/xfel/metrology/__init__.py
index 90e2556218..576bc76773 100644
--- a/xfel/metrology/__init__.py
+++ b/xfel/metrology/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xfel_metrology_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xfel_metrology_ext")
 from xfel_metrology_ext import *
diff --git a/xfel/metrology/legacy_scale/__init__.py b/xfel/metrology/legacy_scale/__init__.py
index 93c75c35c0..1e1547955f 100644
--- a/xfel/metrology/legacy_scale/__init__.py
+++ b/xfel/metrology/legacy_scale/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xfel_legacy_scale_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xfel_legacy_scale_ext")
 from xfel_legacy_scale_ext import *
diff --git a/xfel/mono_simulation/__init__.py b/xfel/mono_simulation/__init__.py
index 82f379ca9d..5156a6f64d 100644
--- a/xfel/mono_simulation/__init__.py
+++ b/xfel/mono_simulation/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import, division, print_function
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xfel_mono_sim_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xfel_mono_sim_ext")
 from xfel_mono_sim_ext import *
diff --git a/xfel/vonHamos/__init__.py b/xfel/vonHamos/__init__.py
index 382b5af8b5..63bebc59ff 100644
--- a/xfel/vonHamos/__init__.py
+++ b/xfel/vonHamos/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function
 from scitbx.lstbx import normal_eqns # import dependency
-import boost_adaptbx.python
-ext = boost_adaptbx.python.import_ext("xes_ext")
+import boost_adaptbx.boost.python as bp
+ext = bp.import_ext("xes_ext")
 from xes_ext import *