diff --git a/src/swcio.hpp b/src/swcio.hpp
index d362109dd15b771ac897bb884380682214f113b0..ac39de4e1f975f3029e2716fcc8f4fb78102ad7d 100644
--- a/src/swcio.hpp
+++ b/src/swcio.hpp
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <type_traits>
 
-namespace neuron
+namespace nestmc
 {
 
 namespace io
@@ -259,5 +259,5 @@ std::ostream &operator<<(std::ostream &os, const cell_record &cell)
     return os;
 }
 
-}   // end of neuron::io
-}   // end of neuron
+}   // end of nestmc::io
+}   // end of nestmc
diff --git a/tests/test_swcio.cpp b/tests/test_swcio.cpp
index 5a11a5ed214e884d0e5da248ba2fff2abcaac4b2..24ff682bbc8dd9cbc0f228e927ddad8ef0298a80 100644
--- a/tests/test_swcio.cpp
+++ b/tests/test_swcio.cpp
@@ -8,8 +8,8 @@
 #include <swcio.hpp>
 
 // SWC tests
-void expect_cell_equals(const neuron::io::cell_record &expected,
-                        const neuron::io::cell_record &actual)
+void expect_cell_equals(const nestmc::io::cell_record &expected,
+                        const nestmc::io::cell_record &actual)
 {
     EXPECT_EQ(expected.id(), actual.id());
     EXPECT_EQ(expected.type(), actual.type());
@@ -22,7 +22,7 @@ void expect_cell_equals(const neuron::io::cell_record &expected,
 
 TEST(cell_record, construction)
 {
-    using namespace neuron::io;
+    using namespace nestmc::io;
 
     {
         // force an invalid type
@@ -89,7 +89,7 @@ TEST(cell_record, construction)
 
 TEST(swc_parser, invalid_input)
 {
-    using namespace neuron::io;
+    using namespace nestmc::io;
 
     {
         // check incomplete lines; missing parent
@@ -116,7 +116,7 @@ TEST(swc_parser, invalid_input)
 
 TEST(swc_parser, valid_input)
 {
-    using namespace neuron::io;
+    using namespace nestmc::io;
 
     {
         // check empty file; no cell may be parsed
@@ -182,7 +182,7 @@ TEST(swc_parser, valid_input)
 
 TEST(swc_parser, from_allen_db)
 {
-    using namespace neuron;
+    using namespace nestmc;
 
     auto fname = "../data/example.swc";
     std::ifstream fid(fname);
diff --git a/vector b/vector
index a8dfadd460262ebbc1bc22b159efe9e33ad1d359..9c86d0a84efed0dd739888503d275378df67fe71 160000
--- a/vector
+++ b/vector
@@ -1 +1 @@
-Subproject commit a8dfadd460262ebbc1bc22b159efe9e33ad1d359
+Subproject commit 9c86d0a84efed0dd739888503d275378df67fe71