diff --git a/libuavcan/include/uavcan/data_type.hpp b/libuavcan/include/uavcan/data_type.hpp
index 3bb82eebd3..0a8f6156bd 100644
--- a/libuavcan/include/uavcan/data_type.hpp
+++ b/libuavcan/include/uavcan/data_type.hpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <uavcan/internal/transport/crc.hpp>
 #include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/array.hpp b/libuavcan/include/uavcan/internal/marshal/array.hpp
similarity index 99%
rename from libuavcan/include/uavcan/internal/marshalling/array.hpp
rename to libuavcan/include/uavcan/internal/marshal/array.hpp
index fcadfdd797..cf6f1019f2 100644
--- a/libuavcan/include/uavcan/internal/marshalling/array.hpp
+++ b/libuavcan/include/uavcan/internal/marshal/array.hpp
@@ -10,7 +10,7 @@
 #include <typeinfo>
 #include <uavcan/internal/impl_constants.hpp>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/bit_stream.hpp b/libuavcan/include/uavcan/internal/marshal/bit_stream.hpp
similarity index 100%
rename from libuavcan/include/uavcan/internal/marshalling/bit_stream.hpp
rename to libuavcan/include/uavcan/internal/marshal/bit_stream.hpp
diff --git a/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp b/libuavcan/include/uavcan/internal/marshal/float_spec.hpp
similarity index 97%
rename from libuavcan/include/uavcan/internal/marshalling/float_spec.hpp
rename to libuavcan/include/uavcan/internal/marshal/float_spec.hpp
index 3533244c3a..0b9cb581b5 100644
--- a/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp
+++ b/libuavcan/include/uavcan/internal/marshal/float_spec.hpp
@@ -8,8 +8,8 @@
 #include <limits>
 #include <math.h>            // Needed for isfinite
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
-#include <uavcan/internal/marshalling/integer_spec.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
+#include <uavcan/internal/marshal/integer_spec.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp b/libuavcan/include/uavcan/internal/marshal/integer_spec.hpp
similarity index 96%
rename from libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp
rename to libuavcan/include/uavcan/internal/marshal/integer_spec.hpp
index 00376fe643..285f9af71c 100644
--- a/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp
+++ b/libuavcan/include/uavcan/internal/marshal/integer_spec.hpp
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <limits>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/scalar_codec.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
+#include <uavcan/internal/marshal/scalar_codec.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/scalar_codec.hpp b/libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp
similarity index 98%
rename from libuavcan/include/uavcan/internal/marshalling/scalar_codec.hpp
rename to libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp
index d86d52f168..2e5d67669e 100644
--- a/libuavcan/include/uavcan/internal/marshalling/scalar_codec.hpp
+++ b/libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <string>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/bit_stream.hpp>
+#include <uavcan/internal/marshal/bit_stream.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/type_util.hpp b/libuavcan/include/uavcan/internal/marshal/type_util.hpp
similarity index 100%
rename from libuavcan/include/uavcan/internal/marshalling/type_util.hpp
rename to libuavcan/include/uavcan/internal/marshal/type_util.hpp
diff --git a/libuavcan/include/uavcan/internal/marshal/types.hpp b/libuavcan/include/uavcan/internal/marshal/types.hpp
new file mode 100644
index 0000000000..c5f0e75b38
--- /dev/null
+++ b/libuavcan/include/uavcan/internal/marshal/types.hpp
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/internal/marshal/integer_spec.hpp>
+#include <uavcan/internal/marshal/float_spec.hpp>
+#include <uavcan/internal/marshal/array.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
diff --git a/libuavcan/include/uavcan/internal/marshalling/types.hpp b/libuavcan/include/uavcan/internal/marshalling/types.hpp
deleted file mode 100644
index f3de6374f5..0000000000
--- a/libuavcan/include/uavcan/internal/marshalling/types.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
- */
-
-#pragma once
-
-#include <uavcan/internal/marshalling/integer_spec.hpp>
-#include <uavcan/internal/marshalling/float_spec.hpp>
-#include <uavcan/internal/marshalling/array.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
diff --git a/libuavcan/src/marshalling/bit_array_copy.c b/libuavcan/src/marshal/bit_array_copy.c
similarity index 100%
rename from libuavcan/src/marshalling/bit_array_copy.c
rename to libuavcan/src/marshal/bit_array_copy.c
diff --git a/libuavcan/src/marshalling/bit_stream.cpp b/libuavcan/src/marshal/bit_stream.cpp
similarity index 97%
rename from libuavcan/src/marshalling/bit_stream.cpp
rename to libuavcan/src/marshal/bit_stream.cpp
index a9dda27ee0..428c274f16 100644
--- a/libuavcan/src/marshalling/bit_stream.cpp
+++ b/libuavcan/src/marshal/bit_stream.cpp
@@ -4,7 +4,7 @@
 
 #include <cassert>
 #include <sstream>
-#include <uavcan/internal/marshalling/bit_stream.hpp>
+#include <uavcan/internal/marshal/bit_stream.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/marshalling/float_spec.cpp b/libuavcan/src/marshal/float_spec.cpp
similarity index 97%
rename from libuavcan/src/marshalling/float_spec.cpp
rename to libuavcan/src/marshal/float_spec.cpp
index 631007638b..da60be3a51 100644
--- a/libuavcan/src/marshalling/float_spec.cpp
+++ b/libuavcan/src/marshal/float_spec.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/internal/marshalling/float_spec.hpp>
+#include <uavcan/internal/marshal/float_spec.hpp>
 #include <cmath>
 
 namespace uavcan
diff --git a/libuavcan/test/marshalling/array.cpp b/libuavcan/test/marshal/array.cpp
similarity index 99%
rename from libuavcan/test/marshalling/array.cpp
rename to libuavcan/test/marshal/array.cpp
index 26e8c02f05..799372f6ac 100644
--- a/libuavcan/test/marshalling/array.cpp
+++ b/libuavcan/test/marshal/array.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 using uavcan::Array;
 using uavcan::ArrayModeDynamic;
diff --git a/libuavcan/test/marshalling/bit_stream.cpp b/libuavcan/test/marshal/bit_stream.cpp
similarity index 99%
rename from libuavcan/test/marshalling/bit_stream.cpp
rename to libuavcan/test/marshal/bit_stream.cpp
index 0886c03604..88ef67cc43 100644
--- a/libuavcan/test/marshalling/bit_stream.cpp
+++ b/libuavcan/test/marshal/bit_stream.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/bit_stream.hpp>
+#include <uavcan/internal/marshal/bit_stream.hpp>
 
 
 TEST(BitStream, ToString)
diff --git a/libuavcan/test/marshalling/float_spec.cpp b/libuavcan/test/marshal/float_spec.cpp
similarity index 99%
rename from libuavcan/test/marshalling/float_spec.cpp
rename to libuavcan/test/marshal/float_spec.cpp
index bbabd6a387..361f7d9792 100644
--- a/libuavcan/test/marshalling/float_spec.cpp
+++ b/libuavcan/test/marshal/float_spec.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 
 TEST(FloatSpec, Limits)
diff --git a/libuavcan/test/marshalling/integer_spec.cpp b/libuavcan/test/marshal/integer_spec.cpp
similarity index 98%
rename from libuavcan/test/marshalling/integer_spec.cpp
rename to libuavcan/test/marshal/integer_spec.cpp
index 5bac591682..137e43459b 100644
--- a/libuavcan/test/marshalling/integer_spec.cpp
+++ b/libuavcan/test/marshal/integer_spec.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 
 TEST(IntegerSpec, Limits)
diff --git a/libuavcan/test/marshalling/scalar_codec.cpp b/libuavcan/test/marshal/scalar_codec.cpp
similarity index 98%
rename from libuavcan/test/marshalling/scalar_codec.cpp
rename to libuavcan/test/marshal/scalar_codec.cpp
index 2dd2e32d05..39ac3de1a4 100644
--- a/libuavcan/test/marshalling/scalar_codec.cpp
+++ b/libuavcan/test/marshal/scalar_codec.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/scalar_codec.hpp>
+#include <uavcan/internal/marshal/scalar_codec.hpp>
 
 
 TEST(ScalarCodec, Basic)