diff --git a/.travis.yml b/.travis.yml
index de888098..c73fb23b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright Hans P. Dembinski 2016-2017
+# Copyright Hans Dembinski 2016-2017
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
 
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 4b503eff..8bf6d3da 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Klemens D. Morgenstern, Hans P. Dembinski
+# Copyright (c) 2016-2017 Klemens D. Morgenstern, Hans Dembinski
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/include/boost/histogram.hpp b/include/boost/histogram.hpp
index 87c4c39b..4df37431 100644
--- a/include/boost/histogram.hpp
+++ b/include/boost/histogram.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/arithmetic_operators.hpp b/include/boost/histogram/arithmetic_operators.hpp
index 023f0483..6c142588 100644
--- a/include/boost/histogram/arithmetic_operators.hpp
+++ b/include/boost/histogram/arithmetic_operators.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/axis/any.hpp b/include/boost/histogram/axis/any.hpp
index a2029f16..0d007903 100644
--- a/include/boost/histogram/axis/any.hpp
+++ b/include/boost/histogram/axis/any.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -93,7 +93,7 @@ public:
   using types = typename base_type::types;
   using value_type = double;
   using bin_type = interval<double>;
-  using const_iterator = axis_iterator<any>;
+  using const_iterator = iterator_over<any>;
 
   any() = default;
   any(const any &t) = default;
diff --git a/include/boost/histogram/axis/axis.hpp b/include/boost/histogram/axis/axis.hpp
index 15d8ad20..c5b72420 100644
--- a/include/boost/histogram/axis/axis.hpp
+++ b/include/boost/histogram/axis/axis.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -180,7 +180,7 @@ class regular : public axis_base_uoflow, Transform {
 public:
   using value_type = RealType;
   using bin_type = interval<value_type>;
-  using const_iterator = axis_iterator<regular>;
+  using const_iterator = iterator_over<regular>;
 
   /** Construct axis with n bins over real range [lower, upper).
    *
@@ -262,7 +262,7 @@ template <typename RealType> class circular : public axis_base {
 public:
   using value_type = RealType;
   using bin_type = interval<value_type>;
-  using const_iterator = axis_iterator<circular>;
+  using const_iterator = iterator_over<circular>;
 
   /** Constructor for n bins with an optional offset.
    *
@@ -326,7 +326,7 @@ template <typename RealType> class variable : public axis_base_uoflow {
 public:
   using value_type = RealType;
   using bin_type = interval<value_type>;
-  using const_iterator = axis_iterator<variable>;
+  using const_iterator = iterator_over<variable>;
 
   /** Construct an axis from bin edges.
    *
@@ -416,7 +416,7 @@ template <typename IntType> class integer : public axis_base_uoflow {
 public:
   using value_type = IntType;
   using bin_type = interval<value_type>;
-  using const_iterator = axis_iterator<integer>;
+  using const_iterator = iterator_over<integer>;
 
   /** Construct axis over a semi-open integer interval [lower, upper).
    *
@@ -487,7 +487,7 @@ template <typename T> class category : public axis_base {
 public:
   using value_type = T;
   using bin_type = T;
-  using const_iterator = axis_iterator<category<T>>;
+  using const_iterator = iterator_over<category<T>>;
 
   category() = default;
   category(const category &rhs)
diff --git a/include/boost/histogram/axis/iterator.hpp b/include/boost/histogram/axis/iterator.hpp
index 8010322f..deeae353 100644
--- a/include/boost/histogram/axis/iterator.hpp
+++ b/include/boost/histogram/axis/iterator.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -15,25 +15,25 @@ namespace histogram {
 namespace axis {
 
 template <typename Axis>
-class axis_iterator
-    : public iterator_facade<axis_iterator<Axis>,
+class iterator_over
+    : public iterator_facade<iterator_over<Axis>,
                              std::pair<int, typename Axis::bin_type>,
                              random_access_traversal_tag,
                              std::pair<int, typename Axis::bin_type>> {
 public:
-  explicit axis_iterator(const Axis &axis, int idx) : axis_(axis), idx_(idx) {}
+  explicit iterator_over(const Axis &axis, int idx) : axis_(axis), idx_(idx) {}
 
-  axis_iterator(const axis_iterator &) = default;
-  axis_iterator &operator=(const axis_iterator &) = default;
+  iterator_over(const iterator_over &) = default;
+  iterator_over &operator=(const iterator_over &) = default;
 
 private:
   void increment() noexcept { ++idx_; }
   void decrement() noexcept { --idx_; }
   void advance(int n) noexcept { idx_ += n; }
-  int distance_to(const axis_iterator &other) const noexcept {
+  int distance_to(const iterator_over &other) const noexcept {
     return other.idx_ - idx_;
   }
-  bool equal(const axis_iterator &other) const noexcept {
+  bool equal(const iterator_over &other) const noexcept {
     return idx_ == other.idx_;
   }
   std::pair<int, typename Axis::bin_type> dereference() const {
diff --git a/include/boost/histogram/axis/ostream_operators.hpp b/include/boost/histogram/axis/ostream_operators.hpp
index 77916326..cbd9df58 100644
--- a/include/boost/histogram/axis/ostream_operators.hpp
+++ b/include/boost/histogram/axis/ostream_operators.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/detail/axis_visitor.hpp b/include/boost/histogram/detail/axis_visitor.hpp
index e0c08460..6618de12 100644
--- a/include/boost/histogram/detail/axis_visitor.hpp
+++ b/include/boost/histogram/detail/axis_visitor.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Demsizeki
+// Copyright 2015-2017 Hans Demsizeki
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/detail/meta.hpp b/include/boost/histogram/detail/meta.hpp
index b5a40694..58708928 100644
--- a/include/boost/histogram/detail/meta.hpp
+++ b/include/boost/histogram/detail/meta.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/detail/utility.hpp b/include/boost/histogram/detail/utility.hpp
index a52df239..66a44b3a 100644
--- a/include/boost/histogram/detail/utility.hpp
+++ b/include/boost/histogram/detail/utility.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/dynamic_histogram.hpp b/include/boost/histogram/dynamic_histogram.hpp
index cb2ea18d..1584c25d 100644
--- a/include/boost/histogram/dynamic_histogram.hpp
+++ b/include/boost/histogram/dynamic_histogram.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/interval.hpp b/include/boost/histogram/interval.hpp
index 4bc9cf07..c3113205 100644
--- a/include/boost/histogram/interval.hpp
+++ b/include/boost/histogram/interval.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/ostream_operators.hpp b/include/boost/histogram/ostream_operators.hpp
index ec4f5c20..df69eb2b 100644
--- a/include/boost/histogram/ostream_operators.hpp
+++ b/include/boost/histogram/ostream_operators.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/serialization.hpp b/include/boost/histogram/serialization.hpp
index c67c7264..f4759cfd 100644
--- a/include/boost/histogram/serialization.hpp
+++ b/include/boost/histogram/serialization.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/storage/adaptive_storage.hpp b/include/boost/histogram/storage/adaptive_storage.hpp
index b08a1030..b8bf158d 100644
--- a/include/boost/histogram/storage/adaptive_storage.hpp
+++ b/include/boost/histogram/storage/adaptive_storage.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/storage/array_storage.hpp b/include/boost/histogram/storage/array_storage.hpp
index 4620194a..82817d05 100644
--- a/include/boost/histogram/storage/array_storage.hpp
+++ b/include/boost/histogram/storage/array_storage.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/include/boost/histogram/storage/operators.hpp b/include/boost/histogram/storage/operators.hpp
index 5554cb20..ef4326e3 100644
--- a/include/boost/histogram/storage/operators.hpp
+++ b/include/boost/histogram/storage/operators.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/src/python/axis.cpp b/src/python/axis.cpp
index 36321a6d..c6c9b510 100644
--- a/src/python/axis.cpp
+++ b/src/python/axis.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/src/python/histogram.cpp b/src/python/histogram.cpp
index 8c0fa58d..92bb1727 100644
--- a/src/python/histogram.cpp
+++ b/src/python/histogram.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/src/python/module.cpp b/src/python/module.cpp
index 0fc9adb4..a8bd5cbf 100644
--- a/src/python/module.cpp
+++ b/src/python/module.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/src/python/serialization_suite.hpp b/src/python/serialization_suite.hpp
index 56b08415..c13dc8c1 100644
--- a/src/python/serialization_suite.hpp
+++ b/src/python/serialization_suite.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/src/python/utility.hpp b/src/python/utility.hpp
index f96cf740..56722812 100644
--- a/src/python/utility.hpp
+++ b/src/python/utility.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/adaptive_storage_test.cpp b/test/adaptive_storage_test.cpp
index 32fa5971..7d1187e6 100644
--- a/test/adaptive_storage_test.cpp
+++ b/test/adaptive_storage_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/array_storage_test.cpp b/test/array_storage_test.cpp
index c9fbe72a..6d5be44d 100644
--- a/test/array_storage_test.cpp
+++ b/test/array_storage_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/axis_size.cpp b/test/axis_size.cpp
index 7d7bcab3..8941fcba 100644
--- a/test/axis_size.cpp
+++ b/test/axis_size.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/axis_test.cpp b/test/axis_test.cpp
index 40959d89..ce8646ab 100644
--- a/test/axis_test.cpp
+++ b/test/axis_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/detail_test.cpp b/test/detail_test.cpp
index 680ba3ca..59791c58 100644
--- a/test/detail_test.cpp
+++ b/test/detail_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/histogram_test.cpp b/test/histogram_test.cpp
index 0b084b1d..0e2c7bc9 100644
--- a/test/histogram_test.cpp
+++ b/test/histogram_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/speed_cpp.cpp b/test/speed_cpp.cpp
index 64f47a8c..141865c4 100644
--- a/test/speed_cpp.cpp
+++ b/test/speed_cpp.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/speed_gsl.cpp b/test/speed_gsl.cpp
index bebce52e..564586a0 100644
--- a/test/speed_gsl.cpp
+++ b/test/speed_gsl.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
diff --git a/test/speed_root.cpp b/test/speed_root.cpp
index f52249b5..e66a48f1 100644
--- a/test/speed_root.cpp
+++ b/test/speed_root.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 Hans Dembinski
+// Copyright 2015-2017 Hans Dembinski
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt