diff --git a/Core/Parametrization/INode.cpp b/Core/Parametrization/INode.cpp
index 663429f9fb0c84b5fb0adf24a1ba6b04be925803..551ea0fc8eece508bb704990c10734e887b830e9 100644
--- a/Core/Parametrization/INode.cpp
+++ b/Core/Parametrization/INode.cpp
@@ -16,7 +16,7 @@
 #include "INode.h"
 #include "Exceptions.h"
 #include "NodeUtils.h"
-#include "SampleTreeIterator.h"
+#include "NodeIterator.h"
 #include "ISampleIteratorStrategy.h"
 #include "ParameterPool.h"
 #include <algorithm>
diff --git a/Core/Parametrization/INodeVisitor.cpp b/Core/Parametrization/INodeVisitor.cpp
index a702feb8ff286821a530740d908c5872d301a1e5..97c32534f226b3cd16645cf844ec632d1a88feeb 100644
--- a/Core/Parametrization/INodeVisitor.cpp
+++ b/Core/Parametrization/INodeVisitor.cpp
@@ -14,7 +14,7 @@
 // ************************************************************************** //
 
 #include "ISampleIteratorStrategy.h"
-#include "SampleTreeIterator.h"
+#include "NodeIterator.h"
 
 void VisitSampleTreePreorder(const INode& node, INodeVisitor& visitor)
 {
diff --git a/Core/Parametrization/ISampleIteratorStrategy.cpp b/Core/Parametrization/ISampleIteratorStrategy.cpp
index 8968d731364cb7af8c05e6627ce9e14aedaba2f2..b6ccbf3a3b44918bae56e9fd433d98aae67bce80 100644
--- a/Core/Parametrization/ISampleIteratorStrategy.cpp
+++ b/Core/Parametrization/ISampleIteratorStrategy.cpp
@@ -15,7 +15,7 @@
 
 #include "ISampleIteratorStrategy.h"
 #include "Exceptions.h"
-#include "SampleTreeIterator.h"
+#include "NodeIterator.h"
 
 SampleIteratorPreorderStrategy::SampleIteratorPreorderStrategy()
 {
diff --git a/Core/Parametrization/SampleTreeIterator.cpp b/Core/Parametrization/NodeIterator.cpp
similarity index 96%
rename from Core/Parametrization/SampleTreeIterator.cpp
rename to Core/Parametrization/NodeIterator.cpp
index 9ce36ca4f397ab70e217a94050827e30c55aa120..9d8026c1ba6ee1fe72e4fe02d490093b3bfe4cf9 100644
--- a/Core/Parametrization/SampleTreeIterator.cpp
+++ b/Core/Parametrization/NodeIterator.cpp
@@ -13,8 +13,7 @@
 //
 // ************************************************************************** //
 
-#include "SampleTreeIterator.h"
-
+#include "NodeIterator.h"
 
 IteratorState::IteratorState(const INode *single_element)
     : m_position(0)
diff --git a/Core/Parametrization/SampleTreeIterator.h b/Core/Parametrization/NodeIterator.h
similarity index 100%
rename from Core/Parametrization/SampleTreeIterator.h
rename to Core/Parametrization/NodeIterator.h
diff --git a/Core/Parametrization/NodeUtils.cpp b/Core/Parametrization/NodeUtils.cpp
index f82ada26153b84f8b40da9810e101497253ac27a..36cc4eda44d3a1421f6ebc3a1d55ba96d21d5fa0 100644
--- a/Core/Parametrization/NodeUtils.cpp
+++ b/Core/Parametrization/NodeUtils.cpp
@@ -14,7 +14,7 @@
 // ************************************************************************** //
 
 #include "NodeUtils.h"
-#include "SampleTreeIterator.h"
+#include "NodeIterator.h"
 #include "ISampleIteratorStrategy.h"
 #include "RealParameter.h"
 #include "ParameterPool.h"