diff --git a/ostream.cpp b/ostream.cpp
index c4ea5a7..00a4008 100644
--- a/ostream.cpp
+++ b/ostream.cpp
@@ -12,7 +12,7 @@
 #include "instance.hpp"
 #include "physical_device.hpp"
 
-#include <cruft/util/iterator.hpp>
+#include <cruft/util/iterator/infix.hpp>
 
 #include <iomanip>
 #include <ostream>
@@ -81,7 +81,7 @@ cruft::vk::operator<< (std::ostream &os, const instance &i)
     const auto &extensions = i.extensions ();
     std::copy (std::cbegin (extensions),
                std::cend   (extensions),
-               cruft::infix_iterator<std::string> (os, ", "));
+               cruft::iterator::infix_iterator<std::string> (os, ", "));
 
     return os << " ] }";
 }
@@ -160,10 +160,10 @@ std::ostream&
 cruft::vk::operator<< (std::ostream &os, const physical_device &d)
 {
     return os << "physical_device { "
-              << "extensions: [ " << cruft::make_infix (d.extensions ()) << " ]"
+              << "extensions: [ " << cruft::iterator::make_infix (d.extensions ()) << " ]"
               << ", properties: " << d.properties ()
               << ", features: " << d.features ()
-              << ", queues: [ " << cruft::make_infix (d.queue_families ()) << " ]"
+              << ", queues: [ " << cruft::iterator::make_infix (d.queue_families ()) << " ]"
               << " }";
 }
 
diff --git a/tools/info.cpp b/tools/info.cpp
index 6a91290..9e5749f 100644
--- a/tools/info.cpp
+++ b/tools/info.cpp
@@ -7,7 +7,7 @@
  *      2017-2018, Danny Robson <danny@nerdcruft.net>
  */
 
-#include <cruft/util/iterator.hpp>
+#include <cruft/util/iterator/infix.hpp>
 
 #include <cruft/vk/load/ostream.hpp>
 #include <cruft/vk/load/vtable.hpp>
@@ -31,9 +31,9 @@ main (int, char**)
 
     std::cout << "[ "
         << "available_layers: [ "
-            << cruft::make_infix (cruft::vk::instance::available_layers ())
+            << cruft::iterator::make_infix (cruft::vk::instance::available_layers ())
         << " ] }"
         << ", instance: " << instance
-        << ", devices: [ " << cruft::make_infix (cruft::vk::physical_device::find (instance)) << " ], "
+        << ", devices: [ " << cruft::iterator::make_infix (cruft::vk::physical_device::find (instance)) << " ], "
         << " } ]\n";
 }
\ No newline at end of file