diff --git a/src/include/allocator.h b/src/include/allocator.h
index 5d66dac..f894381 100644
--- a/src/include/allocator.h
+++ b/src/include/allocator.h
@@ -12,7 +12,7 @@
 #define MIB_SIZE 1024*1024 // 1MiB
 #define WARN_SIZE MIB_SIZE*100 // 100 MiB
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
 
     template <typename T>
@@ -65,12 +65,12 @@ namespace MultiArrayHelper
     }
 
     
-} // namespace MultiArrayHelper
+} // namespace CNORXZInternal
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename T>
-    using vector = std::vector<T,MultiArrayHelper::Allocator<T>>;
+    using vector = std::vector<T,CNORXZInternal::Allocator<T>>;
 
     template <typename T>
     inline std::vector<T> toStdVec(const vector<T>& v)
@@ -84,6 +84,6 @@ namespace MultiArrayTools
         return vector<T>(v.begin(), v.end());
     }
     
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/arith.cc.h b/src/include/arith.cc.h
index 28dae5d..6eec6f4 100644
--- a/src/include/arith.cc.h
+++ b/src/include/arith.cc.h
@@ -1,7 +1,7 @@
 
 #include "arith.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <class F>
diff --git a/src/include/arith.h b/src/include/arith.h
index 6423911..10a865f 100644
--- a/src/include/arith.h
+++ b/src/include/arith.h
@@ -4,7 +4,7 @@
 
 #include <functional>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     //template <typename T, class F, typename... As>
@@ -206,7 +206,7 @@ namespace MultiArrayTools
 	}
     };
 
-} // end namespace MultiArrayHelper
+} // end namespace CNORXZInternal
 
 #include "arith.cc.h"
 
diff --git a/src/include/basic_types.h b/src/include/basic_types.h
index 78884c3..0e0a9c7 100644
--- a/src/include/basic_types.h
+++ b/src/include/basic_types.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     // just to fix this forever:
diff --git a/src/include/container_index.cc.h b/src/include/container_index.cc.h
index 1e8c333..20e79be 100644
--- a/src/include/container_index.cc.h
+++ b/src/include/container_index.cc.h
@@ -1,7 +1,7 @@
 
 #include "container_index.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     template <typename T, class... Indices>
@@ -437,4 +437,4 @@ namespace MultiArrayTools
 	return IB::mPos >= it.pos();
     }
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
diff --git a/src/include/container_index.h b/src/include/container_index.h
index 0dec151..c457e44 100644
--- a/src/include/container_index.h
+++ b/src/include/container_index.h
@@ -13,7 +13,7 @@
 #include "statics/static_for.h"
 #include "ranges/range_helper.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     template <typename T, class... Indices>
@@ -302,6 +302,6 @@ namespace MultiArrayTools
 	
     };
 
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
 #endif
diff --git a/src/include/conversions.h b/src/include/conversions.h
index 14f3bc8..76ffb87 100644
--- a/src/include/conversions.h
+++ b/src/include/conversions.h
@@ -5,7 +5,7 @@
 #include "cxz_array.h"
 #include "slice.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     namespace ConversionSizes
diff --git a/src/include/cxz_array.cc.h b/src/include/cxz_array.cc.h
index 8e95ec8..3d90a10 100644
--- a/src/include/cxz_array.cc.h
+++ b/src/include/cxz_array.cc.h
@@ -2,7 +2,7 @@
 #include "cxz_array.h"
 #include "statics/static_for.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename T>
     Scalar<T> scalar(const T& in)
diff --git a/src/include/cxz_array.h b/src/include/cxz_array.h
index 265fb57..97e98ad 100644
--- a/src/include/cxz_array.h
+++ b/src/include/cxz_array.h
@@ -8,7 +8,7 @@
 #include "cxz_array_base.h"
 #include "ranges/anonymous_range.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename T>
     struct ArrayCatter;
diff --git a/src/include/cxz_array_base.cc.h b/src/include/cxz_array_base.cc.h
index 9ad0ea9..f24c198 100644
--- a/src/include/cxz_array_base.cc.h
+++ b/src/include/cxz_array_base.cc.h
@@ -1,7 +1,7 @@
 
 #include "cxz_array_base.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
         
     /**********************
@@ -270,5 +270,5 @@ namespace MultiArrayTools
 	return ConstOperationRoot<T,MappedRanges...>(*this, inds...);
     }
 
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
diff --git a/src/include/cxz_array_base.h b/src/include/cxz_array_base.h
index 71de4fa..791215e 100644
--- a/src/include/cxz_array_base.h
+++ b/src/include/cxz_array_base.h
@@ -13,7 +13,7 @@
 
 #include "ranges/rheader.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <class IndexType>
@@ -178,7 +178,7 @@ namespace MultiArrayTools
     };
 
     
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
diff --git a/src/include/cxz_operation.cc.h b/src/include/cxz_operation.cc.h
index 6d31809..3d12cae 100644
--- a/src/include/cxz_operation.cc.h
+++ b/src/include/cxz_operation.cc.h
@@ -8,11 +8,11 @@
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
     
     /***************************
diff --git a/src/include/cxz_operation.h b/src/include/cxz_operation.h
index 6aeb0d6..6299e35 100644
--- a/src/include/cxz_operation.h
+++ b/src/include/cxz_operation.h
@@ -21,12 +21,12 @@
 
 #include "statics/static_for.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     template <typename T, class OperationClass>
diff --git a/src/include/dynamic_operation.cc.h b/src/include/dynamic_operation.cc.h
index fcb579a..c0f02fe 100644
--- a/src/include/dynamic_operation.cc.h
+++ b/src/include/dynamic_operation.cc.h
@@ -2,7 +2,7 @@
 #include "dynamic_operation.h"
 #include "helper_tools.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename T, class Operation>
     T DynamicOperation<T,Operation>::get(const DExtT& pos) const
@@ -195,4 +195,4 @@ namespace MultiArrayTools
         return std::make_shared<DynamicOuterOp<T,Operation,Ranges...>>(*this);
     }
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
diff --git a/src/include/dynamic_operation.h b/src/include/dynamic_operation.h
index 038b34e..08fed92 100644
--- a/src/include/dynamic_operation.h
+++ b/src/include/dynamic_operation.h
@@ -5,7 +5,7 @@
 #include "base_def.h"
 #include "cxz_operation.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <typename T>
@@ -204,6 +204,6 @@ namespace MultiArrayTools
 
     };
     */
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/functional_array.cc.h b/src/include/functional_array.cc.h
index e0ae0a8..02fb54e 100644
--- a/src/include/functional_array.cc.h
+++ b/src/include/functional_array.cc.h
@@ -1,7 +1,7 @@
 
 #include "functional_array.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
 
@@ -96,4 +96,4 @@ namespace MultiArrayTools
         return mkOperation( mFunc, MetaOperationRoot<SRanges>( inds ) ... );
     }
     
-} // namespace MultiArrayTools
+} // namespace CNORXZ
diff --git a/src/include/functional_array.h b/src/include/functional_array.h
index 65fc7bf..10112dc 100644
--- a/src/include/functional_array.h
+++ b/src/include/functional_array.h
@@ -5,7 +5,7 @@
 #include "cxz_array_base.h"
 #include "slice.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     template <typename T, class Function, class... SRanges>
@@ -51,7 +51,7 @@ namespace MultiArrayTools
     };
 
   
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
diff --git a/src/include/helper_tools.cc.h b/src/include/helper_tools.cc.h
index 8822929..957eb96 100644
--- a/src/include/helper_tools.cc.h
+++ b/src/include/helper_tools.cc.h
@@ -1,7 +1,7 @@
 
 #include "helper_tools.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename... T>
     std::ostream& operator<<(std::ostream& out, const std::tuple<T...>& tp)
diff --git a/src/include/helper_tools.h b/src/include/helper_tools.h
index e8906df..71f5788 100644
--- a/src/include/helper_tools.h
+++ b/src/include/helper_tools.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include "xfor/iloop.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     template <typename... T>
@@ -173,16 +173,16 @@ namespace MultiArrayTools
     auto mkILoop(const OpTp& opTp, const IndTp& indTp, const VarTp& varTp, const LTp& lTp,
                  const std::array<size_t,std::tuple_size<LTp>::value>& umpos,
                  const std::array<size_t,std::tuple_size<VarTp>::value>& setzero)
-        -> MultiArrayHelper::ILoop<OpTp,IndTp,VarTp,LTp>
+        -> CNORXZInternal::ILoop<OpTp,IndTp,VarTp,LTp>
     {
-        return MultiArrayHelper::ILoop<OpTp,IndTp,VarTp,LTp>(opTp, indTp, varTp, lTp, umpos, setzero);
+        return CNORXZInternal::ILoop<OpTp,IndTp,VarTp,LTp>(opTp, indTp, varTp, lTp, umpos, setzero);
     }
 
     template <class CF>
     auto mkPILoop(const CF& cf)
-        -> MultiArrayHelper::PILoop<CF>
+        -> CNORXZInternal::PILoop<CF>
     {
-        return MultiArrayHelper::PILoop<CF>(cf);
+        return CNORXZInternal::PILoop<CF>(cf);
     }
 
     template <class IndexType>
diff --git a/src/include/high_level_operation.cc.h b/src/include/high_level_operation.cc.h
index 14643d7..b66440c 100644
--- a/src/include/high_level_operation.cc.h
+++ b/src/include/high_level_operation.cc.h
@@ -1,7 +1,7 @@
 
 #include "high_level_operation.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <typename T, class Op>
diff --git a/src/include/high_level_operation.h b/src/include/high_level_operation.h
index d3acf1f..71706fa 100644
--- a/src/include/high_level_operation.h
+++ b/src/include/high_level_operation.h
@@ -6,7 +6,7 @@
 #include "ranges/rheader.h"
 #include "dynamic_operation.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     typedef ClassicRange CR;
diff --git a/src/include/map_range.cc.h b/src/include/map_range.cc.h
index d43c481..8cc780e 100644
--- a/src/include/map_range.cc.h
+++ b/src/include/map_range.cc.h
@@ -2,12 +2,12 @@
 #include "map_range.h"
 #include <type_traits>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     /**************
diff --git a/src/include/map_range.h b/src/include/map_range.h
index ed70235..9532f2b 100644
--- a/src/include/map_range.h
+++ b/src/include/map_range.h
@@ -18,11 +18,11 @@
 
 #include "xfor/xfor.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
 
diff --git a/src/include/map_range_factory_product_map.h b/src/include/map_range_factory_product_map.h
index cd0eab9..cc89ed2 100644
--- a/src/include/map_range_factory_product_map.h
+++ b/src/include/map_range_factory_product_map.h
@@ -8,7 +8,7 @@
 #include "ranges/rbase_def.h"
 #include "mbase_def.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     class MapRangeFactoryProductMap
     {
diff --git a/src/include/mbase_def.h b/src/include/mbase_def.h
index ccf3458..39eb5a4 100644
--- a/src/include/mbase_def.h
+++ b/src/include/mbase_def.h
@@ -5,7 +5,7 @@
 #include "ranges/rbase_def.h"
 #include "allocator.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /***********************
      *  Provided Types     *
diff --git a/src/include/operation_def.h b/src/include/operation_def.h
index adb6ca0..287970c 100644
--- a/src/include/operation_def.h
+++ b/src/include/operation_def.h
@@ -4,7 +4,7 @@
 
 #include "cxz_operation.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <typename T, class OperationClass>
diff --git a/src/include/ranges/anonymous_range.h b/src/include/ranges/anonymous_range.h
index 9d4a4ab..031d0c0 100644
--- a/src/include/ranges/anonymous_range.h
+++ b/src/include/ranges/anonymous_range.h
@@ -11,7 +11,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/type_map.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     typedef GenSingleIndex<size_t,SpaceType::ANON,MUI> AnonymousIndex;
@@ -133,7 +133,7 @@ namespace MultiArrayTools
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     /***********************
@@ -171,7 +171,7 @@ namespace MultiArrayTools
 
     std::shared_ptr<AnonymousRange> defaultRange(size_t size = 0);
 }
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace RangeHelper
     {
@@ -202,7 +202,7 @@ namespace MultiArrayTools
     }
 }
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /***********************
      *   AnonymousRange    *
diff --git a/src/include/ranges/dynamic_meta.h b/src/include/ranges/dynamic_meta.h
index 29346f7..51535aa 100644
--- a/src/include/ranges/dynamic_meta.h
+++ b/src/include/ranges/dynamic_meta.h
@@ -7,7 +7,7 @@
 
 #include "allocator.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     typedef std::pair<const char*,size_t> DynamicMetaElem;
@@ -66,6 +66,6 @@ namespace MultiArrayTools
     };
 
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/ranges/dynamic_range.cc.h b/src/include/ranges/dynamic_range.cc.h
index 99fc800..77bc659 100644
--- a/src/include/ranges/dynamic_range.cc.h
+++ b/src/include/ranges/dynamic_range.cc.h
@@ -1,11 +1,11 @@
 
 #include "ranges/dynamic_range.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-        using namespace MultiArrayHelper;
+        using namespace CNORXZInternal;
     }
 
 
@@ -186,9 +186,9 @@ namespace MultiArrayTools
     }
 
     
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace RangeHelper
     {
diff --git a/src/include/ranges/dynamic_range.h b/src/include/ranges/dynamic_range.h
index 8a9e6bf..f0075c6 100644
--- a/src/include/ranges/dynamic_range.h
+++ b/src/include/ranges/dynamic_range.h
@@ -17,11 +17,11 @@
 
 #include "index_wrapper.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     class DynamicIndex : public IndexInterface<DynamicIndex,vector<char>>
@@ -223,10 +223,10 @@ namespace MultiArrayTools
 
     };
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace RangeHelper
     {
diff --git a/src/include/ranges/index_base.h b/src/include/ranges/index_base.h
index 550aa08..9c0c4b2 100644
--- a/src/include/ranges/index_base.h
+++ b/src/include/ranges/index_base.h
@@ -13,7 +13,7 @@
 
 #include "xfor/xfor.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     template <class I, typename MetaType>
@@ -106,7 +106,7 @@ namespace MultiArrayTools
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /**********************
      *   IndexInterface   *
diff --git a/src/include/ranges/index_type.h b/src/include/ranges/index_type.h
index 6d8c52a..ac5e0fd 100644
--- a/src/include/ranges/index_type.h
+++ b/src/include/ranges/index_type.h
@@ -2,7 +2,7 @@
 #ifndef __index_type_h__
 #define __index_type_h__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     enum class IndexType{
 	SINGLE = 0,
diff --git a/src/include/ranges/index_wrapper.cc.h b/src/include/ranges/index_wrapper.cc.h
index 9b734e9..20d180d 100644
--- a/src/include/ranges/index_wrapper.cc.h
+++ b/src/include/ranges/index_wrapper.cc.h
@@ -2,7 +2,7 @@
 #include "index_wrapper.h"
 #include "range_helper.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <class Index>
diff --git a/src/include/ranges/index_wrapper.h b/src/include/ranges/index_wrapper.h
index 3a58fd6..580412e 100644
--- a/src/include/ranges/index_wrapper.h
+++ b/src/include/ranges/index_wrapper.h
@@ -6,11 +6,11 @@
 #include "xfor/xfor.h"
 #include "ranges/rheader.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     class IndexWrapperBase
diff --git a/src/include/ranges/multi_range.h b/src/include/ranges/multi_range.h
index 71c765e..3ab22d6 100644
--- a/src/include/ranges/multi_range.h
+++ b/src/include/ranges/multi_range.h
@@ -18,11 +18,11 @@
 
 #include "statics/static_for.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
     
     template <class... Indices>
@@ -218,12 +218,12 @@ namespace MultiArrayTools
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     // -> define in range_base.cc
diff --git a/src/include/ranges/multi_range_factory_product_map.h b/src/include/ranges/multi_range_factory_product_map.h
index e9dcb38..6630b1d 100644
--- a/src/include/ranges/multi_range_factory_product_map.h
+++ b/src/include/ranges/multi_range_factory_product_map.h
@@ -7,7 +7,7 @@
 #include <map>
 #include "ranges/rbase_def.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     class MultiRangeFactoryProductMap
     {
diff --git a/src/include/ranges/range_base.h b/src/include/ranges/range_base.h
index 8217797..a701e3d 100644
--- a/src/include/ranges/range_base.h
+++ b/src/include/ranges/range_base.h
@@ -9,12 +9,12 @@
 
 #include "rbase_def.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     class RangeBase;
 }
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     size_t indexId();
diff --git a/src/include/ranges/range_helper.h b/src/include/ranges/range_helper.h
index 7c78c9b..53f1462 100644
--- a/src/include/ranges/range_helper.h
+++ b/src/include/ranges/range_helper.h
@@ -2,7 +2,7 @@
 #ifndef __range_helper_h__
 #define __range_helper_h__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace RangeHelper
     {
@@ -167,7 +167,7 @@ namespace MultiArrayTools
 				     RangeTuple& rtp, size_t off, size_t size, SIZET... sizes)
 	{
 	    constexpr size_t tps = std::tuple_size<RangeTuple>::value;
-	    ::MultiArrayTools::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
+	    ::CNORXZ::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
 	    if constexpr(N < tps-1){
 		resolveRangeType<N+1>(orig, rtp, off+size, sizes...);
 	    }
@@ -178,7 +178,7 @@ namespace MultiArrayTools
 				     RangeTuple& rtp, size_t off, size_t size)
 	{
 	    constexpr size_t tps = std::tuple_size<RangeTuple>::value;
-	    ::MultiArrayTools::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
+	    ::CNORXZ::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
 	}
 
 	template <size_t N, class MetaType, class... Ranges>
@@ -280,6 +280,6 @@ namespace MultiArrayTools
 	}
 
     } // namespace RangeHelper
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/ranges/range_types/classic_range.h b/src/include/ranges/range_types/classic_range.h
index 6de6587..492d66a 100644
--- a/src/include/ranges/range_types/classic_range.h
+++ b/src/include/ranges/range_types/classic_range.h
@@ -10,7 +10,7 @@
 #ifndef __range_type_classic_def__
 #define __range_type_classic_def__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     typedef GenSingleIndex<size_t,SpaceType::NONE,MUI> ClassicIndex;
 
diff --git a/src/include/ranges/range_types/null_range.h b/src/include/ranges/range_types/null_range.h
index 9776482..b87e39e 100644
--- a/src/include/ranges/range_types/null_range.h
+++ b/src/include/ranges/range_types/null_range.h
@@ -10,7 +10,7 @@ include_range_type(NUL,-2)
 #ifndef __range_type_null_def__
 #define __range_type_null_def__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {   
     typedef GenSingleIndex<size_t,SpaceType::NUL,0> NullIndex;
 
diff --git a/src/include/ranges/range_types/space_range.h b/src/include/ranges/range_types/space_range.h
index 20022d5..badc9d7 100644
--- a/src/include/ranges/range_types/space_range.h
+++ b/src/include/ranges/range_types/space_range.h
@@ -8,7 +8,7 @@ include_range_type(PSPACE,3) // Periodic 1dim space
 #ifndef __range_type_space_def__
 #define __range_type_space_def__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
      // Periodic 1dim space
     typedef GenSingleIndex<int,SpaceType::PSPACE,MUI> XSpaceIndex;
diff --git a/src/include/ranges/range_types/spin_range.h b/src/include/ranges/range_types/spin_range.h
index cf9b923..256f9be 100644
--- a/src/include/ranges/range_types/spin_range.h
+++ b/src/include/ranges/range_types/spin_range.h
@@ -10,7 +10,7 @@ include_range_type(SPIN,2)
 #ifndef __range_type_spin_def__
 #define __range_type_spin_def__
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     typedef GenSingleIndex<size_t,SpaceType::SPIN,4> SpinIndex;
 
diff --git a/src/include/ranges/rbase_def.h b/src/include/ranges/rbase_def.h
index 289b2b6..2aa04fa 100644
--- a/src/include/ranges/rbase_def.h
+++ b/src/include/ranges/rbase_def.h
@@ -17,7 +17,7 @@
 #include "allocator.h"
 #define MUI static_cast<size_t>(-1)
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <class R>
diff --git a/src/include/ranges/single_range.h b/src/include/ranges/single_range.h
index 643bfc0..17d5887 100644
--- a/src/include/ranges/single_range.h
+++ b/src/include/ranges/single_range.h
@@ -16,11 +16,11 @@
 
 #include "xfor/for_type.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     
@@ -327,7 +327,7 @@ namespace MultiArrayTools
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /******************
      *  GenSingleIndex   *	     
diff --git a/src/include/ranges/subrange.h b/src/include/ranges/subrange.h
index 3ec6d80..e34bea7 100644
--- a/src/include/ranges/subrange.h
+++ b/src/include/ranges/subrange.h
@@ -15,11 +15,11 @@
 
 #include "xfor/for_type.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     template <class Index>
@@ -154,9 +154,9 @@ namespace MultiArrayTools
         
     };
     
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     
     /*****************
diff --git a/src/include/ranges/type_map.h b/src/include/ranges/type_map.h
index 09c69f9..3f65c7b 100644
--- a/src/include/ranges/type_map.h
+++ b/src/include/ranges/type_map.h
@@ -10,7 +10,7 @@
 
 #include "allocator.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <size_t N>
diff --git a/src/include/ranges/value_range.h b/src/include/ranges/value_range.h
index e1e667c..db236e1 100644
--- a/src/include/ranges/value_range.h
+++ b/src/include/ranges/value_range.h
@@ -17,12 +17,12 @@
 
 #include "xfor/for_type.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
     
     template <typename U>
@@ -138,13 +138,13 @@ namespace MultiArrayTools
 	ValueRange() = default;
     };
     
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /*****************
      *  ValueIndex   *	     
@@ -410,6 +410,6 @@ namespace MultiArrayTools
     }
 
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/ranges/x_to_string.h b/src/include/ranges/x_to_string.h
index 5a28635..aa66616 100644
--- a/src/include/ranges/x_to_string.h
+++ b/src/include/ranges/x_to_string.h
@@ -10,7 +10,7 @@
 
 #include "ranges/dynamic_meta.h"
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     template <typename T>
     inline std::string xToString(const T& x);
@@ -22,7 +22,7 @@ namespace MultiArrayHelper
     template <>
     inline std::string xToString<std::string>(const std::string& x);
 
-    using MultiArrayTools::DynamicMetaT;
+    using CNORXZ::DynamicMetaT;
     
     template <>
     inline std::string xToString<DynamicMetaT>(const DynamicMetaT& x);
diff --git a/src/include/slice.cc.h b/src/include/slice.cc.h
index 54235c3..5a118e3 100644
--- a/src/include/slice.cc.h
+++ b/src/include/slice.cc.h
@@ -1,7 +1,7 @@
 
 #include "slice.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     /*******************
@@ -296,5 +296,5 @@ namespace MultiArrayTools
     }
 
 
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
diff --git a/src/include/slice.h b/src/include/slice.h
index 16ed001..68b4c27 100644
--- a/src/include/slice.h
+++ b/src/include/slice.h
@@ -5,7 +5,7 @@
 #include "cxz_array_base.h"
 #include "cxz_operation.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <typename T, class... SRanges>
     class ConstSlice : public MultiArrayBase<T,SRanges...>
@@ -188,7 +188,7 @@ namespace MultiArrayTools
 	return SliceDef<T,Ranges...>::mkSlice(ind, op);
     }
 
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
diff --git a/src/include/statics/static_for.h b/src/include/statics/static_for.h
index b4a76e0..d8758ed 100644
--- a/src/include/statics/static_for.h
+++ b/src/include/statics/static_for.h
@@ -4,7 +4,7 @@
 
 #include <cstdlib>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <size_t BEG, size_t END, int OFF, typename Incr, typename F>
     inline auto sfor(Incr incr, F f)
@@ -94,7 +94,7 @@ namespace MultiArrayTools
 #define MA_DEC [&](auto i) constexpr { return i-1; }
 #define MA_ZCONC [&](auto a, auto b) { return 0; }
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     template <size_t BEG, size_t END, typename F>
     inline auto sfor_p(F f)
diff --git a/src/include/statics/traits.h b/src/include/statics/traits.h
index 6bf12b5..2a97631 100644
--- a/src/include/statics/traits.h
+++ b/src/include/statics/traits.h
@@ -1,7 +1,7 @@
 
 #include "base_def.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     template <typename T>
diff --git a/src/include/type_operations.h b/src/include/type_operations.h
index be955d1..acebd59 100644
--- a/src/include/type_operations.h
+++ b/src/include/type_operations.h
@@ -13,11 +13,11 @@
 
 #include <cmath>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-	using namespace MultiArrayHelper;
+	using namespace CNORXZInternal;
     }
 
     // MultiArray
@@ -518,6 +518,6 @@ namespace MultiArrayTools
 	return out;
     }
 
-} // namespace MultiArrayTools
+} // namespace CNORXZ
 
 #endif
diff --git a/src/include/xfor/exttype.h b/src/include/xfor/exttype.h
index a4b6a3a..fc72b50 100644
--- a/src/include/xfor/exttype.h
+++ b/src/include/xfor/exttype.h
@@ -4,7 +4,7 @@
 
 #include <array>
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     
     struct None;
@@ -375,13 +375,13 @@ namespace MultiArrayHelper
 	return getX<I>(et).get();
     }
 
-} // end namespace MultiArrayHelper
+} // end namespace CNORXZInternal
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
  * ========================= */
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
 
     template <class X>
@@ -517,7 +517,7 @@ namespace MultiArrayHelper
 	return getX<N>(*this);
     }
 
-} // end namespace MultiArrayHelper
+} // end namespace CNORXZInternal
 
 
 #endif
diff --git a/src/include/xfor/for_type.h b/src/include/xfor/for_type.h
index 7ddaf18..7880ed7 100644
--- a/src/include/xfor/for_type.h
+++ b/src/include/xfor/for_type.h
@@ -2,7 +2,7 @@
 #ifndef __for_type_h__
 #define __for_type_h__
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     
     enum class ForType {
@@ -17,7 +17,7 @@ namespace MultiArrayHelper
     class PFor;
 
     
-} // end namespace MultiArrayHelper
+} // end namespace CNORXZInternal
 
 
 #endif
diff --git a/src/include/xfor/for_utils.h b/src/include/xfor/for_utils.h
index 20679b0..5722d7e 100644
--- a/src/include/xfor/for_utils.h
+++ b/src/include/xfor/for_utils.h
@@ -6,7 +6,7 @@
 #include <array>
 #include <tuple>
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     namespace {
         template <class Op>
@@ -34,6 +34,6 @@ namespace MultiArrayHelper
 
     };
     
-} // end namespace MultiArrayHelper
+} // end namespace CNORXZInternal
 
 #endif
diff --git a/src/include/xfor/iloop.h b/src/include/xfor/iloop.h
index 1afcc46..c54aaad 100644
--- a/src/include/xfor/iloop.h
+++ b/src/include/xfor/iloop.h
@@ -9,7 +9,7 @@
 #include <omp.h>
 #include "xfor.h"
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     template <size_t N>
     struct NN
diff --git a/src/include/xfor/xfor.h b/src/include/xfor/xfor.h
index 0b761b3..2125538 100644
--- a/src/include/xfor/xfor.h
+++ b/src/include/xfor/xfor.h
@@ -15,9 +15,9 @@
 #define VCHECK(a) std::cout << __FILE__ << ": @" << __LINE__ \
     << " in " << __func__ << ": " << #a << " = " << a << std::endl; 
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
-    using namespace MultiArrayTools;
+    using namespace CNORXZ;
     // 'HIDDEN FOR' CLASS for nested for loops in contractions a.s.o.
     // (NO COUNTING OF MASTER POSITION !!!!!)
 
@@ -562,7 +562,7 @@ namespace MultiArrayHelper
 
     };
 
-} // namespace MultiArrayHelper
+} // namespace CNORXZInternal
 
 /* ========================= *
  * ---   TEMPLATE CODE   --- *
@@ -570,7 +570,7 @@ namespace MultiArrayHelper
 
 #include <iostream>
 
-namespace MultiArrayHelper
+namespace CNORXZInternal
 {
     template <class ExtType>
     const ExtType& ExtBase::expl() const
@@ -1035,6 +1035,6 @@ namespace MultiArrayHelper
 
 
     
-} // namespace MultiArrayHelper
+} // namespace CNORXZInternal
 
 #endif
diff --git a/src/lib/high_level_operation.cc b/src/lib/high_level_operation.cc
index 187f922..fd6a280 100644
--- a/src/lib/high_level_operation.cc
+++ b/src/lib/high_level_operation.cc
@@ -2,7 +2,7 @@
 #include "cnorxz.h"
 #include "hl_cnorxz.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::shared_ptr<DynamicIndex> mkSubSpaceX(const std::shared_ptr<DynamicIndex>& di,
 					      size_t max)
diff --git a/src/lib/map_range_factory_product_map.cc b/src/lib/map_range_factory_product_map.cc
index 28fbe39..0991b75 100644
--- a/src/lib/map_range_factory_product_map.cc
+++ b/src/lib/map_range_factory_product_map.cc
@@ -1,7 +1,7 @@
 
 #include "map_range_factory_product_map.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::map<std::shared_ptr<RangeBase>,vector<std::intptr_t> > MapRangeFactoryProductMap::mAleadyCreated;
 }
diff --git a/src/lib/mk_hl_op.sh b/src/lib/mk_hl_op.sh
index e7cd329..77c7ecd 100755
--- a/src/lib/mk_hl_op.sh
+++ b/src/lib/mk_hl_op.sh
@@ -12,7 +12,7 @@ for x in $(cat ../include/extensions/math.h) ; do
     echo "#include \"cnorxz.h\"" >> ${file}
     echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
-    echo "namespace MultiArrayTools" >> ${file}
+    echo "namespace CNORXZ" >> ${file}
     echo "{" >> ${file}
     echo "    template class HighLevelOp<OpCD,x_${fff}<double>,1>;" >> ${file}
     echo "    template class HighLevelOp<OpD,x_${fff}<double>,1>;" >> ${file}
@@ -27,7 +27,7 @@ for fff in plus minus multiplies divides ; do
     echo "#include \"cnorxz.h\"" >> ${file}
     echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
-    echo "namespace MultiArrayTools" >> ${file}
+    echo "namespace CNORXZ" >> ${file}
     echo "{" >> ${file}
     echo "    template class HighLevelOp<OpCD,${fff}x<double,double>,2>;" >> ${file}
     echo "    template class HighLevelOp<OpD,${fff}x<double,double>,2>;" >> ${file}
@@ -40,7 +40,7 @@ for fff in negate ; do
     echo "#include \"cnorxz.h\"" >> ${file}
     echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
-    echo "namespace MultiArrayTools" >> ${file}
+    echo "namespace CNORXZ" >> ${file}
     echo "{" >> ${file}
     echo "    template class HighLevelOp<OpCD,${fff}<double>,1>;" >> ${file}
     echo "    template class HighLevelOp<OpD,${fff}<double>,1>;" >> ${file}
diff --git a/src/lib/ranges/anonymous_range.cc b/src/lib/ranges/anonymous_range.cc
index c895763..9f2f652 100644
--- a/src/lib/ranges/anonymous_range.cc
+++ b/src/lib/ranges/anonymous_range.cc
@@ -3,7 +3,7 @@
 #include "ranges/ranges_header.cc.h"
 #include "ma_assert.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /******************************
      *   AnonymousRangeFactory    *
@@ -294,4 +294,4 @@ namespace MultiArrayTools
 
 
     
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
diff --git a/src/lib/ranges/dynamic_meta.cc b/src/lib/ranges/dynamic_meta.cc
index e25cb02..5422bdf 100644
--- a/src/lib/ranges/dynamic_meta.cc
+++ b/src/lib/ranges/dynamic_meta.cc
@@ -4,7 +4,7 @@
 #include "ranges/dynamic_meta.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
     /*********************
@@ -45,4 +45,4 @@ namespace MultiArrayTools
 
 
     
-} // namespace MultiArrayTools
+} // namespace CNORXZ
diff --git a/src/lib/ranges/dynamic_range.cc b/src/lib/ranges/dynamic_range.cc
index 6227486..fc02940 100644
--- a/src/lib/ranges/dynamic_range.cc
+++ b/src/lib/ranges/dynamic_range.cc
@@ -3,11 +3,11 @@
 #include "ranges/ranges_header.cc.h"
 #include "ma_assert.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     namespace
     {
-        using namespace MultiArrayHelper;
+        using namespace CNORXZInternal;
     }
 
 
@@ -484,5 +484,5 @@ namespace MultiArrayTools
         return mOrig;
     }
     
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
 
diff --git a/src/lib/ranges/multi_range_factory_product_map.cc b/src/lib/ranges/multi_range_factory_product_map.cc
index 7a072cb..1597ddf 100644
--- a/src/lib/ranges/multi_range_factory_product_map.cc
+++ b/src/lib/ranges/multi_range_factory_product_map.cc
@@ -2,7 +2,7 @@
 #include "ranges/multi_range_factory_product_map.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::map<std::shared_ptr<RangeBase>,vector<std::intptr_t> > MultiRangeFactoryProductMap::mAleadyCreated;
 }
diff --git a/src/lib/ranges/range_base.cc b/src/lib/ranges/range_base.cc
index 6e6448a..ba8a3be 100644
--- a/src/lib/ranges/range_base.cc
+++ b/src/lib/ranges/range_base.cc
@@ -11,10 +11,10 @@
 
 #include <algorithm>
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 
-    //using namespace MultiArrayHelpers;
+    //using namespace CNORXZInternals;
 
     template <class... Ranges>
     using STP = std::tuple<std::shared_ptr<Ranges>...>;
@@ -215,4 +215,4 @@ namespace MultiArrayTools
         return reinterpret_cast<std::intptr_t>(this);
     }
 
-} // end namespace MultiArrayTools
+} // end namespace CNORXZ
diff --git a/src/lib/ranges/range_types/classic_range.cc b/src/lib/ranges/range_types/classic_range.cc
index 790332d..73a0a22 100644
--- a/src/lib/ranges/range_types/classic_range.cc
+++ b/src/lib/ranges/range_types/classic_range.cc
@@ -3,7 +3,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     /********************
      *   GenSingleRange    *
diff --git a/src/lib/ranges/range_types/null_range.cc b/src/lib/ranges/range_types/null_range.cc
index 5c0db14..6dc79cc 100644
--- a/src/lib/ranges/range_types/null_range.cc
+++ b/src/lib/ranges/range_types/null_range.cc
@@ -3,7 +3,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::shared_ptr<NullRF> mkNUL(const char* dp, size_t size)
     {
diff --git a/src/lib/ranges/range_types/space_range.cc b/src/lib/ranges/range_types/space_range.cc
index efc7fe6..39a3257 100644
--- a/src/lib/ranges/range_types/space_range.cc
+++ b/src/lib/ranges/range_types/space_range.cc
@@ -3,7 +3,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::shared_ptr<PSpaceRF> mkPSPACE(const char* dp, size_t size)
     {
diff --git a/src/lib/ranges/range_types/spin_range.cc b/src/lib/ranges/range_types/spin_range.cc
index 26791f1..40770fd 100644
--- a/src/lib/ranges/range_types/spin_range.cc
+++ b/src/lib/ranges/range_types/spin_range.cc
@@ -3,7 +3,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
     std::shared_ptr<SpinRF> mkSPIN(const char* dp, size_t size)
     {
diff --git a/src/lib/ranges/type_map.cc b/src/lib/ranges/type_map.cc
index 730ade8..9796b38 100644
--- a/src/lib/ranges/type_map.cc
+++ b/src/lib/ranges/type_map.cc
@@ -2,7 +2,7 @@
 #include "ranges/type_map.h"
 #include "ranges/ranges_header.cc.h"
 
-namespace MultiArrayTools
+namespace CNORXZ
 {
 #define XCOMMAX() ,
 #define include_type(t,n) template struct TypeMap<n>; \
diff --git a/src/tests/ma_unit_test.cc b/src/tests/ma_unit_test.cc
index 160caf8..bc85a74 100644
--- a/src/tests/ma_unit_test.cc
+++ b/src/tests/ma_unit_test.cc
@@ -6,7 +6,7 @@
 
 #include "cnorxz.h"
 
-namespace MAT = MultiArrayTools;
+namespace MAT = CNORXZ;
 
 namespace {
 
diff --git a/src/tests/op_perf_test.cc b/src/tests/op_perf_test.cc
index 084a6a8..6e32837 100644
--- a/src/tests/op_perf_test.cc
+++ b/src/tests/op_perf_test.cc
@@ -13,7 +13,7 @@
 
 #define ONLY_SPIN
 
-namespace MAT = MultiArrayTools;
+namespace MAT = CNORXZ;
 
 namespace {
 
diff --git a/src/tests/ranges/anonymous_unit_test.cc b/src/tests/ranges/anonymous_unit_test.cc
index 0b1a237..7507de8 100644
--- a/src/tests/ranges/anonymous_unit_test.cc
+++ b/src/tests/ranges/anonymous_unit_test.cc
@@ -8,7 +8,7 @@
 #include "cnorxz.h"
 //#include "ranges/ranges_header.cc.h"
 
-namespace MAT = MultiArrayTools;
+namespace MAT = CNORXZ;
 
 namespace {
 
diff --git a/src/tests/ranges/index_unit_test.cc b/src/tests/ranges/index_unit_test.cc
index 6ab9959..1f84272 100644
--- a/src/tests/ranges/index_unit_test.cc
+++ b/src/tests/ranges/index_unit_test.cc
@@ -6,7 +6,7 @@
 
 #include "cnorxz.h"
 
-namespace MAT = MultiArrayTools;
+namespace MAT = CNORXZ;
 
 namespace {
 
diff --git a/src/tests/test_header.h b/src/tests/test_header.h
index 09b772c..f41d3a1 100644
--- a/src/tests/test_header.h
+++ b/src/tests/test_header.h
@@ -9,7 +9,7 @@
 #include <ctime>
 #include <cmath>
 
-namespace MAT = MultiArrayTools;
+namespace MAT = CNORXZ;
 
 double xround(double arg)
 {