diff --git a/src/lib/format.hpp b/src/lib/format-util.hpp
similarity index 100%
rename from src/lib/format.hpp
rename to src/lib/format-util.hpp
diff --git a/src/lib/meta/duck-detector.hpp b/src/lib/meta/duck-detector.hpp
index bed83ce63..a559ed27a 100644
--- a/src/lib/meta/duck-detector.hpp
+++ b/src/lib/meta/duck-detector.hpp
@@ -30,7 +30,7 @@
  ** Because, if we can get a \c bool answer to such a question <i>at compile time,</i> we can use
  ** \c boost::enable_if to pick a special implementation based on the test result. Together, these
  ** techniques allow to adopt a duck-typed programming style, where an arbitrary object is allowed
- ** to enter a given API function, provided this object supports some special operations.
+ ** to enter a given API function, provided this object supports some specific operations.
  ** 
  ** While C++ certainly isn't a dynamic language and doesn't provide any kind of run time introspection,
  ** doing such check-and branch at compile time allows even to combine such a flexible approach with
diff --git a/src/lib/simple-allocator.hpp b/src/lib/simple-allocator.hpp
index 8dd5cea25..c6af61723 100644
--- a/src/lib/simple-allocator.hpp
+++ b/src/lib/simple-allocator.hpp
@@ -49,7 +49,7 @@
 #include "lib/error.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/meta/typelist-util.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/typed-counter.hpp"
 #include "include/logging.h"
 
diff --git a/src/lib/sub-id.hpp b/src/lib/sub-id.hpp
index fa47f42f5..7442fadf5 100644
--- a/src/lib/sub-id.hpp
+++ b/src/lib/sub-id.hpp
@@ -46,7 +46,7 @@
 #ifndef LIB_SUB_ID_H
 #define LIB_SUB_ID_H
 
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 
 //#include <functional>
 #include <boost/functional/hash.hpp>      /////TODO better push the hash implementation into a cpp file (and btw, do it more seriously!)
diff --git a/src/lib/typed-allocation-manager.hpp b/src/lib/typed-allocation-manager.hpp
index a4d8810fc..e44eb01bb 100644
--- a/src/lib/typed-allocation-manager.hpp
+++ b/src/lib/typed-allocation-manager.hpp
@@ -67,7 +67,7 @@
 #define LIB_TYPED_ALLOCATION_MANAGER_H
 
 #include "lib/error.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/typed-counter.hpp"
 #include "include/logging.h"
 
diff --git a/src/proc/control/command-closure.hpp b/src/proc/control/command-closure.hpp
index b03f88405..118beb68a 100644
--- a/src/proc/control/command-closure.hpp
+++ b/src/proc/control/command-closure.hpp
@@ -74,7 +74,7 @@
 #include "lib/meta/function-erasure.hpp"
 #include "lib/meta/tuple.hpp"
 #include "lib/meta/maybe-compare.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/util.hpp"
 #include "proc/control/argument-erasure.hpp"
 #include "lib/typed-allocation-manager.hpp"
diff --git a/src/proc/control/command-registry.hpp b/src/proc/control/command-registry.hpp
index c2231bd6e..c749a2dbc 100644
--- a/src/proc/control/command-registry.hpp
+++ b/src/proc/control/command-registry.hpp
@@ -60,7 +60,6 @@
 #include "lib/error.hpp"
 #include "lib/singleton.hpp"
 #include "lib/sync.hpp"
-#include "lib/format.hpp"
 #include "include/logging.h"
 #include "lib/util.hpp"
 
diff --git a/src/proc/control/memento-tie.hpp b/src/proc/control/memento-tie.hpp
index 0e89f9b21..21881da6e 100644
--- a/src/proc/control/memento-tie.hpp
+++ b/src/proc/control/memento-tie.hpp
@@ -45,7 +45,7 @@
 #include "lib/meta/function-closure.hpp"
 #include "proc/control/command-signature.hpp"
 #include "lib/functor-util.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/util.hpp"
 
 #include <boost/operators.hpp>
diff --git a/tests/components/proc/control/command-use1-test.cpp b/tests/components/proc/control/command-use1-test.cpp
index eaa00b2a5..d854d7f0d 100644
--- a/tests/components/proc/control/command-use1-test.cpp
+++ b/tests/components/proc/control/command-use1-test.cpp
@@ -25,7 +25,7 @@
 #include "lib/test/test-helper.hpp"
 #include "proc/control/command-invocation.hpp"
 #include "proc/control/command-def.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/util.hpp"
 
 #include "proc/control/test-dummy-commands.hpp"
diff --git a/tests/lib/format-helper-test.cpp b/tests/lib/format-helper-test.cpp
index 4c246ff3d..9ca85d3ee 100644
--- a/tests/lib/format-helper-test.cpp
+++ b/tests/lib/format-helper-test.cpp
@@ -22,7 +22,7 @@
 
 
 #include "lib/test/run.hpp"
-#include "lib/format.hpp"
+#include "lib/format-util.hpp"
 #include "lib/error.hpp"
 
 #include <iostream>