diff --git a/include/core/common/wolf.h b/include/core/common/wolf.h
index ef21d670eb042d55da0432781714e09a050ba741..ba0645d1d1ec8d0839cf322bc053e40623f9b321 100644
--- a/include/core/common/wolf.h
+++ b/include/core/common/wolf.h
@@ -206,41 +206,41 @@ struct MatrixSizeCheck
     typedef std::weak_ptr<Name>         Name##WPtr;                                                                   \
     typedef std::weak_ptr<const Name>   Name##ConstWPtr;
 
-#define WOLF_DECLARED_LIST_TYPEDEFS(ClassName)                                                                        \
-    typedef std::list<ClassName##Ptr>                  ClassName##PtrList;                                            \
-    typedef ClassName##PtrList::iterator               ClassName##PtrListIter;                                        \
-    typedef ClassName##PtrList::const_iterator         ClassName##PtrListConstIter;                                   \
-    typedef ClassName##PtrList::reverse_iterator       ClassName##PtrListRevIter;                                     \
-    typedef std::list<ClassName##WPtr>                 ClassName##WPtrList;                                           \
-    typedef ClassName##WPtrList::iterator              ClassName##WPtrListIter;                                       \
-    typedef ClassName##WPtrList::const_iterator        ClassName##WPtrListConstIter;                                  \
-    typedef ClassName##WPtrList::reverse_iterator      ClassName##WPtrListRevIter;                                    \
-    typedef std::list<ClassName##ConstPtr>             ClassName##ConstPtrList;                                       \
-    typedef ClassName##ConstPtrList::iterator          ClassName##ConstPtrListIter;                                   \
-    typedef ClassName##ConstPtrList::const_iterator    ClassName##ConstPtrListConstIter;                              \
-    typedef ClassName##ConstPtrList::reverse_iterator  ClassName##ConstPtrListRevIter;                                \
-    typedef std::list<ClassName##ConstWPtr>            ClassName##ConstWPtrList;                                      \
-    typedef ClassName##ConstWPtrList::iterator         ClassName##ConstWPtrListIter;                                  \
-    typedef ClassName##ConstWPtrList::const_iterator   ClassName##ConstWPtrListConstIter;                             \
-    typedef ClassName##ConstWPtrList::reverse_iterator ClassName##ConstWPtrListRevIter;
-
-#define WOLF_DECLARED_SET_TYPEDEFS(ClassName)                                                                         \
-    typedef std::set<ClassName##Ptr>                  ClassName##PtrSet;                                              \
-    typedef ClassName##PtrSet::iterator               ClassName##PtrSetIter;                                          \
-    typedef ClassName##PtrSet::const_iterator         ClassName##PtrSetConstIter;                                     \
-    typedef ClassName##PtrSet::reverse_iterator       ClassName##PtrSetRevIter;                                       \
-    typedef std::set<ClassName##WPtr>                 ClassName##WPtrSet;                                             \
-    typedef ClassName##WPtrSet::iterator              ClassName##WPtrSetIter;                                         \
-    typedef ClassName##WPtrSet::const_iterator        ClassName##WPtrSetConstIter;                                    \
-    typedef ClassName##WPtrSet::reverse_iterator      ClassName##WPtrSetRevIter;                                      \
-    typedef std::set<ClassName##ConstPtr>             ClassName##ConstPtrSet;                                         \
-    typedef ClassName##ConstPtrSet::iterator          ClassName##ConstPtrSetIter;                                     \
-    typedef ClassName##ConstPtrSet::const_iterator    ClassName##ConstPtrSetConstIter;                                \
-    typedef ClassName##ConstPtrSet::reverse_iterator  ClassName##ConstPtrSetRevIter;                                  \
-    typedef std::set<ClassName##ConstWPtr>            ClassName##ConstWPtrSet;                                        \
-    typedef ClassName##ConstWPtrSet::iterator         ClassName##ConstWPtrSetIter;                                    \
-    typedef ClassName##ConstWPtrSet::const_iterator   ClassName##ConstWPtrSetConstIter;                               \
-    typedef ClassName##ConstWPtrSet::reverse_iterator ClassName##ConstWPtrSetRevIter;
+#define WOLF_DECLARED_LIST_TYPEDEFS(Name)                                                                             \
+    typedef std::list<Name##Ptr>                  Name##PtrList;                                                      \
+    typedef Name##PtrList::iterator               Name##PtrListIter;                                                  \
+    typedef Name##PtrList::const_iterator         Name##PtrListConstIter;                                             \
+    typedef Name##PtrList::reverse_iterator       Name##PtrListRevIter;                                               \
+    typedef std::list<Name##WPtr>                 Name##WPtrList;                                                     \
+    typedef Name##WPtrList::iterator              Name##WPtrListIter;                                                 \
+    typedef Name##WPtrList::const_iterator        Name##WPtrListConstIter;                                            \
+    typedef Name##WPtrList::reverse_iterator      Name##WPtrListRevIter;                                              \
+    typedef std::list<Name##ConstPtr>             Name##ConstPtrList;                                                 \
+    typedef Name##ConstPtrList::iterator          Name##ConstPtrListIter;                                             \
+    typedef Name##ConstPtrList::const_iterator    Name##ConstPtrListConstIter;                                        \
+    typedef Name##ConstPtrList::reverse_iterator  Name##ConstPtrListRevIter;                                          \
+    typedef std::list<Name##ConstWPtr>            Name##ConstWPtrList;                                                \
+    typedef Name##ConstWPtrList::iterator         Name##ConstWPtrListIter;                                            \
+    typedef Name##ConstWPtrList::const_iterator   Name##ConstWPtrListConstIter;                                       \
+    typedef Name##ConstWPtrList::reverse_iterator Name##ConstWPtrListRevIter;
+
+#define WOLF_DECLARED_SET_TYPEDEFS(Name)                                                                              \
+    typedef std::set<Name##Ptr>                  Name##PtrSet;                                                        \
+    typedef Name##PtrSet::iterator               Name##PtrSetIter;                                                    \
+    typedef Name##PtrSet::const_iterator         Name##PtrSetConstIter;                                               \
+    typedef Name##PtrSet::reverse_iterator       Name##PtrSetRevIter;                                                 \
+    typedef std::set<Name##WPtr>                 Name##WPtrSet;                                                       \
+    typedef Name##WPtrSet::iterator              Name##WPtrSetIter;                                                   \
+    typedef Name##WPtrSet::const_iterator        Name##WPtrSetConstIter;                                              \
+    typedef Name##WPtrSet::reverse_iterator      Name##WPtrSetRevIter;                                                \
+    typedef std::set<Name##ConstPtr>             Name##ConstPtrSet;                                                   \
+    typedef Name##ConstPtrSet::iterator          Name##ConstPtrSetIter;                                               \
+    typedef Name##ConstPtrSet::const_iterator    Name##ConstPtrSetConstIter;                                          \
+    typedef Name##ConstPtrSet::reverse_iterator  Name##ConstPtrSetRevIter;                                            \
+    typedef std::set<Name##ConstWPtr>            Name##ConstWPtrSet;                                                  \
+    typedef Name##ConstWPtrSet::iterator         Name##ConstWPtrSetIter;                                              \
+    typedef Name##ConstWPtrSet::const_iterator   Name##ConstWPtrSetConstIter;                                         \
+    typedef Name##ConstWPtrSet::reverse_iterator Name##ConstWPtrSetRevIter;
 
 #define WOLF_PTR_TYPEDEFS(ClassName)                                                                                  \
     class ClassName;                                                                                                  \
@@ -250,9 +250,9 @@ struct MatrixSizeCheck
 
 #define WOLF_STRUCT_PTR_TYPEDEFS(StructName)                                                                          \
     struct StructName;                                                                                                \
-    WOLF_DECLARED_PTR_TYPEDEFS(ClassName);                                                                            \
-    WOLF_DECLARED_LIST_TYPEDEFS(ClassName);                                                                           \
-    WOLF_DECLARED_SET_TYPEDEFS(ClassName);
+    WOLF_DECLARED_PTR_TYPEDEFS(StructName);                                                                           \
+    WOLF_DECLARED_LIST_TYPEDEFS(StructName);                                                                          \
+    WOLF_DECLARED_SET_TYPEDEFS(StructName);
 
 // NodeBase
 WOLF_PTR_TYPEDEFS(NodeBase);