diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index c4d3e174f..38b8493b4 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -122,7 +122,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
     src/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp
     src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp
-    src/opm/parser/eclipse/EclipseState/UDQConfig.cpp
+    src/opm/parser/eclipse/EclipseState/UDQParams.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQExpression.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp
@@ -501,7 +501,7 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/checkDeck.hpp
        opm/parser/eclipse/EclipseState/Runspec.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp
-       opm/parser/eclipse/EclipseState/UDQConfig.hpp
+       opm/parser/eclipse/EclipseState/UDQParams.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQExpression.hpp
        opm/parser/eclipse/Deck/DeckItem.hpp
        opm/parser/eclipse/Deck/Deck.hpp
diff --git a/opm/parser/eclipse/EclipseState/Runspec.hpp b/opm/parser/eclipse/EclipseState/Runspec.hpp
index 3e51bcb5b..236eb281a 100644
--- a/opm/parser/eclipse/EclipseState/Runspec.hpp
+++ b/opm/parser/eclipse/EclipseState/Runspec.hpp
@@ -24,7 +24,7 @@
 
 #include <opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp>
 #include <opm/parser/eclipse/EclipseState/EndpointScaling.hpp>
-#include <opm/parser/eclipse/EclipseState/UDQConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/UDQParams.hpp>
 
 namespace Opm {
 class Deck;
@@ -116,7 +116,7 @@ class Runspec {
    public:
         explicit Runspec( const Deck& );
 
-        const UDQConfig& udqConfig() const noexcept;
+        const UDQParams& udqParams() const noexcept;
         const Phases& phases() const noexcept;
         const Tabdims&  tabdims() const noexcept;
         const EndpointScaling& endpointScaling() const noexcept;
@@ -130,7 +130,7 @@ class Runspec {
         EndpointScaling endscale;
         Welldims welldims;
         WellSegmentDims wsegdims;
-        UDQConfig udq_config;
+        UDQParams udq_params;
 };
 
 }
diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp b/opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp
index dc7b70a1c..099a4e68e 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp
@@ -21,7 +21,6 @@
 #ifndef UDQState_HPP_
 #define UDQState_HPP_
 
-#include <opm/parser/eclipse/EclipseState/UDQConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQExpression.hpp>
 
 
@@ -29,7 +28,7 @@ namespace Opm {
 
     class UDQ{
     public:
-        UDQ(const UDQConfig& config, const Deck& deck);
+        explicit UDQ(const Deck& deck);
         const std::vector<UDQExpression>& expressions() const noexcept;
     private:
         std::vector<UDQExpression> m_expressions;
diff --git a/opm/parser/eclipse/EclipseState/UDQConfig.hpp b/opm/parser/eclipse/EclipseState/UDQParams.hpp
similarity index 88%
rename from opm/parser/eclipse/EclipseState/UDQConfig.hpp
rename to opm/parser/eclipse/EclipseState/UDQParams.hpp
index 66b12bd8f..11a308bbe 100644
--- a/opm/parser/eclipse/EclipseState/UDQConfig.hpp
+++ b/opm/parser/eclipse/EclipseState/UDQParams.hpp
@@ -17,19 +17,19 @@
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPM_UDQ_CONFIG_HPP
-#define OPM_UDQ_CONFIG_HPP
+#ifndef OPM_UDQ_PARAMS_HPP
+#define OPM_UDQ_PARAMS_HPP
 
 
 namespace Opm {
 
     class Deck;
 
-    class UDQConfig
+    class UDQParams
     {
     public:
-        explicit UDQConfig(const Deck& deck);
-        UDQConfig();
+        explicit UDQParams(const Deck& deck);
+        UDQParams();
 
         bool   reseedRNG() const noexcept;
         int    randomSeed() const noexcept;
diff --git a/src/opm/parser/eclipse/EclipseState/Runspec.cpp b/src/opm/parser/eclipse/EclipseState/Runspec.cpp
index ad81201d6..ac9dd6759 100644
--- a/src/opm/parser/eclipse/EclipseState/Runspec.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Runspec.cpp
@@ -123,7 +123,7 @@ Runspec::Runspec( const Deck& deck ) :
     endscale( deck ),
     welldims( deck ),
     wsegdims( deck ),
-    udq_config( deck )
+    udq_params( deck )
 {}
 
 const Phases& Runspec::phases() const noexcept {
@@ -159,8 +159,8 @@ int Runspec::eclPhaseMask( ) const noexcept {
 }
 
 
-const UDQConfig& Runspec::udqConfig() const noexcept {
-    return this->udq_config;
+const UDQParams& Runspec::udqParams() const noexcept {
+    return this->udq_params;
 }
 
 }
diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp
index c099d358e..1db757057 100644
--- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp
@@ -18,12 +18,11 @@
  */
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/EclipseState/UDQConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ.hpp>
 
 namespace Opm {
 
-    UDQ::UDQ(const UDQConfig& /* config */, const Deck& deck) {
+    UDQ::UDQ(const Deck& deck) {
         if (deck.hasKeyword("UDQ")) {
             const auto& kw = deck.getKeyword("UDQ");
             for (const auto& record : kw)
diff --git a/src/opm/parser/eclipse/EclipseState/UDQConfig.cpp b/src/opm/parser/eclipse/EclipseState/UDQParams.cpp
similarity index 85%
rename from src/opm/parser/eclipse/EclipseState/UDQConfig.cpp
rename to src/opm/parser/eclipse/EclipseState/UDQParams.cpp
index b5dcddf43..958f19207 100644
--- a/src/opm/parser/eclipse/EclipseState/UDQConfig.cpp
+++ b/src/opm/parser/eclipse/EclipseState/UDQParams.cpp
@@ -18,7 +18,7 @@
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/ParserKeywords/U.hpp>
-#include <opm/parser/eclipse/EclipseState/UDQConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/UDQParams.hpp>
 
 namespace Opm {
 
@@ -27,7 +27,7 @@ namespace Opm {
       originate in an ECLIPSE implementation detail. Our implementation does not
       require these max values, we therefor ignore them completely.
     */
-    UDQConfig::UDQConfig() :
+    UDQParams::UDQParams() :
         reseed_rng(false),
         random_seed(ParserKeywords::UDQPARAM::RANDOM_SEED::defaultValue),
         value_range(ParserKeywords::UDQPARAM::RANGE::defaultValue),
@@ -36,8 +36,8 @@ namespace Opm {
     {}
 
 
-    UDQConfig::UDQConfig(const Deck& deck) :
-        UDQConfig()
+    UDQParams::UDQParams(const Deck& deck) :
+        UDQParams()
     {
         if (deck.hasKeyword("UDQDIMS")) {
             const auto& record = deck.getKeyword("UDQDIMS").getRecord(0);
@@ -57,23 +57,23 @@ namespace Opm {
     }
 
 
-    bool UDQConfig::reseedRNG() const noexcept {
+    bool UDQParams::reseedRNG() const noexcept {
         return this->reseed_rng;
     }
 
-    int UDQConfig::randomSeed() const noexcept {
+    int UDQParams::randomSeed() const noexcept {
         return this->random_seed;
     }
 
-    double UDQConfig::range() const noexcept {
+    double UDQParams::range() const noexcept {
         return this->value_range;
     }
 
-    double UDQConfig::undefinedValue() const noexcept {
+    double UDQParams::undefinedValue() const noexcept {
         return this->undefined_value;
     }
 
-    double UDQConfig::cmpEpsilon() const noexcept {
+    double UDQParams::cmpEpsilon() const noexcept {
         return this->cmp_eps;
     }
 }
diff --git a/tests/parser/UDQTests.cpp b/tests/parser/UDQTests.cpp
index 5d01593a8..22e1c260c 100644
--- a/tests/parser/UDQTests.cpp
+++ b/tests/parser/UDQTests.cpp
@@ -43,10 +43,10 @@ UDQPARAM
 
     auto deck = parser.parseString(input);
     auto runspec = Runspec(deck);
-    auto udq_config = runspec.udqConfig();
+    auto udq_params = runspec.udqParams();
 
-    BOOST_CHECK(udq_config.reseedRNG());
-    BOOST_CHECK_EQUAL(0.25, udq_config.cmpEpsilon());
+    BOOST_CHECK(udq_params.reseedRNG());
+    BOOST_CHECK_EQUAL(0.25, udq_params.cmpEpsilon());
 }
 
 
@@ -72,8 +72,8 @@ UDQ
     Parser parser;
 
     auto deck = parser.parseString(input);
-    auto udq_config = UDQConfig(deck);
-    auto udq = UDQ(udq_config, deck);
+    auto udq_params = UDQParams(deck);
+    auto udq = UDQ(deck);
     BOOST_CHECK_EQUAL(3, udq.expressions().size());
 }
 
@@ -110,8 +110,8 @@ DEFINE WUMW1 WBHP 'P*1*' UMAX WBHP 'P*4*' /
     Parser parser;
 
     auto deck = parser.parseString(input);
-    auto udq_config = UDQConfig(deck);
-    auto udq = UDQ(udq_config, deck);
+    auto udq_params = UDQParams(deck);
+    auto udq = UDQ(deck);
     const auto& records = udq.expressions();
     const auto& rec0 = records[0];
     const auto& rec1 = records[1];