diff --git a/include/Application.h b/include/Application.h
index 5fa945e308a446e9661c18aa95831eaa96fdb24d..cce7a723a09e3e60d8dd2c4955ca478e94a704e2 100644
--- a/include/Application.h
+++ b/include/Application.h
@@ -343,7 +343,7 @@ namespace ChimeraTK {
       friend class TestFacility;                    // needs access to testableMode_variables
 
       template<typename UserType>
-      friend class DebugDecoratorRegisterAccessor;   // needs access to the idMap
+      friend class DebugPrintAccessorDecorator;   // needs access to the idMap
 
       /** Counter for how many write() operations have overwritten unread data */
       std::atomic<size_t> dataLossCounter{0};
diff --git a/include/DebugDecoratorRegisterAccessor.h b/include/DebugPrintAccessorDecorator.h
similarity index 92%
rename from include/DebugDecoratorRegisterAccessor.h
rename to include/DebugPrintAccessorDecorator.h
index f5cfcbfaae0b4b59d2294667bed950dd8d708746..10ddcb36996906eb00073f0ea4669023c83703a9 100644
--- a/include/DebugDecoratorRegisterAccessor.h
+++ b/include/DebugPrintAccessorDecorator.h
@@ -1,5 +1,5 @@
 /*
- * DebugDecoratorRegisterAccessor.h
+ * DebugPrintAccessorDecorator.h
  *
  *  Created on: Nov 21, 2017
  *      Author: Martin Hierholzer
@@ -16,9 +16,9 @@ namespace ChimeraTK {
 
   /** Decorator of the NDRegisterAccessor which facilitates tests of the application */
   template<typename UserType>
-  class DebugDecoratorRegisterAccessor : public ChimeraTK::NDRegisterAccessorDecorator<UserType> {
+  class DebugPrintAccessorDecorator : public ChimeraTK::NDRegisterAccessorDecorator<UserType> {
     public:
-      DebugDecoratorRegisterAccessor(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor,
+      DebugPrintAccessorDecorator(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor,
                                      const std::string &fullyQualifiedName)
       : ChimeraTK::NDRegisterAccessorDecorator<UserType>(accessor),
         _fullyQualifiedName(fullyQualifiedName)
diff --git a/src/Application.cc b/src/Application.cc
index bf707b733c6a1a0d795f6b7cda30bf613825729e..717ed116c100e25a3b734b3587d9ec390f92e3d3 100644
--- a/src/Application.cc
+++ b/src/Application.cc
@@ -25,7 +25,7 @@
 #include "ArrayAccessor.h"
 #include "ConstantAccessor.h"
 #include "TestableModeAccessorDecorator.h"
-#include "DebugDecoratorRegisterAccessor.h"
+#include "DebugPrintAccessorDecorator.h"
 #include "Visitor.h"
 #include "VariableNetworkGraphDumpingVisitor.h"
 #include "XMLGeneratorVisitor.h"
@@ -433,12 +433,12 @@ std::pair< boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>>, boost::sh
     if(consumer.getType() != NodeType::invalid) {
       assert(node.getDirection().dir == VariableDirection::feeding);
       assert(consumer.getDirection().dir == VariableDirection::consuming);
-      pvarPair.first = boost::make_shared<DebugDecoratorRegisterAccessor<UserType>>(pvarPair.first, node.getQualifiedName());
-      pvarPair.second = boost::make_shared<DebugDecoratorRegisterAccessor<UserType>>(pvarPair.second, consumer.getQualifiedName());
+      pvarPair.first = boost::make_shared<DebugPrintAccessorDecorator<UserType>>(pvarPair.first, node.getQualifiedName());
+      pvarPair.second = boost::make_shared<DebugPrintAccessorDecorator<UserType>>(pvarPair.second, consumer.getQualifiedName());
     }
     else {
-      pvarPair.first = boost::make_shared<DebugDecoratorRegisterAccessor<UserType>>(pvarPair.first, node.getQualifiedName());
-      pvarPair.second = boost::make_shared<DebugDecoratorRegisterAccessor<UserType>>(pvarPair.second, node.getQualifiedName());
+      pvarPair.first = boost::make_shared<DebugPrintAccessorDecorator<UserType>>(pvarPair.first, node.getQualifiedName());
+      pvarPair.second = boost::make_shared<DebugPrintAccessorDecorator<UserType>>(pvarPair.second, node.getQualifiedName());
     }
 
   }