diff --git a/dvmp/analysis/vm_mass.cxx b/dvmp/analysis/vm_mass.cxx
index 26d0cf9a454fa0dbf6a386d9d4d49f45d529f10c..7411955e1b5dd261be0a6c11e9ceb593f1ccbb09 100644
--- a/dvmp/analysis/vm_mass.cxx
+++ b/dvmp/analysis/vm_mass.cxx
@@ -41,7 +41,7 @@ int vm_mass(const std::string& config_name) {
 
   // create our test definition
   // test_tag
-  juggler_util::test vm_mass_resolution_test{
+  eic::util::test vm_mass_resolution_test{
       {{"name",
         fmt::format("{}_{}_{}_mass_resolution", test_tag, vm_name, decay_name)},
        {"title",
@@ -135,8 +135,8 @@ int vm_mass(const std::string& config_name) {
   vm_mass_resolution_test.error(-1);
 
   // write out our test data
-  juggler_util::write_test(vm_mass_resolution_test,
-                           fmt::format("{}vm_mass.json", output_prefix));
+  eic::util::write_test(vm_mass_resolution_test,
+                        fmt::format("{}vm_mass.json", output_prefix));
 
   // That's all!
   return 0;
diff --git a/util/benchmark.hh b/util/benchmark.hh
index aea070f60d77f36a7f7cbefc3152252bc8785ab0..329b5781139d52a56ed9d3be83d019fc72bab846 100644
--- a/util/benchmark.hh
+++ b/util/benchmark.hh
@@ -14,7 +14,7 @@
 // Usage Example 1 (single test):
 // ==============================
 // 1. define our test
-//      juggler_util::test test1{
+//      eic::util::test test1{
 //        {{"name", "example_test"},
 //        {"title", "Example Test"},
 //        {"description", "This is an example of a test definition"},
@@ -23,18 +23,18 @@
 // 2. set pass/fail/error status and return value (in this case .99)
 //      test1.pass(0.99)
 // 3. write our test data to a json file
-//      juggler_util::write_test(test1, "test1.json");
+//      eic::util::write_test(test1, "test1.json");
 //
 // Usage Example 2 (multiple tests):
 // =================================
 // 1. define our tests
-//      juggler_util::test test1{
+//      eic::util::test test1{
 //        {{"name", "example_test"},
 //        {"title", "Example Test"},
 //        {"description", "This is an example of a test definition"},
 //        {"quantity", "efficiency"},
 //        {"target", "1"}}};
-//      juggler_util::test test2{
+//      eic::util::test test2{
 //        {{"name", "another_test"},
 //        {"title", "Another example Test"},
 //        {"description", "This is a second example of a test definition"},
@@ -43,11 +43,11 @@
 // 2. set pass/fail/error status and return value (in this case .99)
 //      test1.fail(10)
 // 3. write our test data to a json file
-//      juggler_util::write_test({test1, test2}, "test.json");
+//      eic::util::write_test({test1, test2}, "test.json");
 
 // Namespace for utility scripts, FIXME this should be part of an independent
 // library
-namespace juggler_util {
+namespace eic::util {
 
 struct test_definition_error : exception {
   test_definition_error(std::string_view msg)
@@ -109,6 +109,6 @@ void write_test(const test& data, const std::string& fname) {
   write_test(vtd, fname);
 }
 
-} // namespace juggler_util
+} // namespace eic::util
 
 #endif
diff --git a/util/exception.hh b/util/exception.hh
index a443c79593d0225d0060e7a29451e8f2d914e020..5eab3d8690ed014487d05c02991922d370a51e8e 100644
--- a/util/exception.hh
+++ b/util/exception.hh
@@ -4,7 +4,7 @@
 #include <exception>
 #include <string>
 
-namespace juggler_util {
+namespace eic::util {
 class exception : public std::exception {
 public:
   exception(std::string_view msg, std::string_view type = "exception")
@@ -18,6 +18,6 @@ private:
   std::string msg_;
   std::string type_;
 };
-} // namespace juggler_util
+} // namespace eic::util
 
 #endif