diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp
index f9c0590276..968efe5a72 100644
--- a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp
+++ b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp
@@ -906,14 +906,14 @@ std::unordered_map<std::string, RiuSummaryQuantityNameInfoProvider::RiuSummaryQu
     info.insert( { "GSIT", { A::SUMMARY_WELL_GROUP, "Salt Injection Total" } } );
     info.insert( { "GSPC", { A::SUMMARY_WELL_GROUP, "Salt Production Concentration" } } );
     info.insert( { "GSIC", { A::SUMMARY_WELL_GROUP, "Salt Injection Concentration" } } );
-    info.insert( { "WTPRANI", { A::SUMMARY_WELL_GROUP, "Anion Production Rate" } } );
-    info.insert( { "WTPTANI", { A::SUMMARY_WELL_GROUP, "Anion Production Total" } } );
-    info.insert( { "WTIRANI", { A::SUMMARY_WELL_GROUP, "Anion Injection Rate" } } );
-    info.insert( { "WTITANI", { A::SUMMARY_WELL_GROUP, "Anion Injection Total" } } );
-    info.insert( { "WTPRCAT", { A::SUMMARY_WELL_GROUP, "Cation Production Rate" } } );
-    info.insert( { "WTPTCAT", { A::SUMMARY_WELL_GROUP, "Cation Production Total" } } );
-    info.insert( { "WTIRCAT", { A::SUMMARY_WELL_GROUP, "Cation Injection Rate" } } );
-    info.insert( { "WTITCAT", { A::SUMMARY_WELL_GROUP, "Cation Injection Total" } } );
+    info.insert( { "WTPRANI", { A::SUMMARY_WELL, "Anion Production Rate" } } );
+    info.insert( { "WTPTANI", { A::SUMMARY_WELL, "Anion Production Total" } } );
+    info.insert( { "WTIRANI", { A::SUMMARY_WELL, "Anion Injection Rate" } } );
+    info.insert( { "WTITANI", { A::SUMMARY_WELL, "Anion Injection Total" } } );
+    info.insert( { "WTPRCAT", { A::SUMMARY_WELL, "Cation Production Rate" } } );
+    info.insert( { "WTPTCAT", { A::SUMMARY_WELL, "Cation Production Total" } } );
+    info.insert( { "WTIRCAT", { A::SUMMARY_WELL, "Cation Injection Rate" } } );
+    info.insert( { "WTITCAT", { A::SUMMARY_WELL, "Cation Injection Total" } } );
     info.insert( { "GTPCHEA", { A::SUMMARY_WELL_GROUP, "Production Temperature" } } );
     info.insert( { "GTICHEA", { A::SUMMARY_WELL_GROUP, "Injection Temperature" } } );
     info.insert( { "GTPRHEA", { A::SUMMARY_WELL_GROUP, "Energy flows" } } );
@@ -1399,6 +1399,33 @@ std::unordered_map<std::string, RiuSummaryQuantityNameInfoProvider::RiuSummaryQu
     info.insert( { "WTPTALK", { A::SUMMARY_WELL, "Production Total" } } );
     info.insert( { "WTIRALK", { A::SUMMARY_WELL, "Injection Rate" } } );
     info.insert( { "WTITALK", { A::SUMMARY_WELL, "Injection Total" } } );
+    info.insert( { "WOFRL", { A::SUMMARY_WELL, "Oil Flow Rate" } } );
+    info.insert( { "WOPRL", { A::SUMMARY_WELL, "Oil Flow Rate" } } );
+    info.insert( { "WOPTL", { A::SUMMARY_WELL, "Oil Production Total" } } );
+    info.insert( { "WOITL", { A::SUMMARY_WELL, "Oil Injection Total" } } );
+    info.insert( { "WWFRL", { A::SUMMARY_WELL, "Water Flow Rate" } } );
+    info.insert( { "WWPRL", { A::SUMMARY_WELL, "Water Flow Rate" } } );
+    info.insert( { "WWPTL", { A::SUMMARY_WELL, "Water Production Total" } } );
+    info.insert( { "WWIRL", { A::SUMMARY_WELL, "Water Injection Rate" } } );
+    info.insert( { "WWITL", { A::SUMMARY_WELL, "Water Injection Total" } } );
+    info.insert( { "WGFRL", { A::SUMMARY_WELL, "Gas Flow Rate" } } );
+    info.insert( { "WGPRL", { A::SUMMARY_WELL, "Gas Flow Rate" } } );
+    info.insert( { "WGPTL", { A::SUMMARY_WELL, "Gas Production Total" } } );
+    info.insert( { "WGIRL", { A::SUMMARY_WELL, "Gas Injection Rate" } } );
+    info.insert( { "WGITL", { A::SUMMARY_WELL, "Gas Injection Total" } } );
+    info.insert( { "WLFRL", { A::SUMMARY_WELL, "Liquid Flow Rate" } } );
+    info.insert( { "WLPTL", { A::SUMMARY_WELL, "Liquid Production Total" } } );
+    info.insert( { "WVFRL", { A::SUMMARY_WELL, "Res Volume Flow Rate" } } );
+    info.insert( { "WVPRL", { A::SUMMARY_WELL, "Res Volume Production Flow Rate" } } );
+    info.insert( { "WVIRL", { A::SUMMARY_WELL, "Res Volume Injection Flow Rate" } } );
+    info.insert( { "WVPTL", { A::SUMMARY_WELL, "Res Volume Production Total" } } );
+    info.insert( { "WVITL", { A::SUMMARY_WELL, "Res Volume Injection Total" } } );
+    info.insert( { "WWCTL", { A::SUMMARY_WELL, "Water Cut" } } );
+    info.insert( { "WGORL", { A::SUMMARY_WELL, "Gas-Oil Ratio" } } );
+    info.insert( { "WOGRL", { A::SUMMARY_WELL, "Oil-Gas Ratio" } } );
+    info.insert( { "WWGRL", { A::SUMMARY_WELL, "Water-Gas Ratio" } } );
+    info.insert( { "WGLRL", { A::SUMMARY_WELL, "Gas-Liquid Ratio" } } );
+
     info.insert( { "WU", { A::SUMMARY_WELL, "User-defined well quantity" } } );
 
     // Future CONNECTION vectors
@@ -1549,57 +1576,31 @@ std::unordered_map<std::string, RiuSummaryQuantityNameInfoProvider::RiuSummaryQu
     info.insert( { "CU", { A::SUMMARY_WELL_COMPLETION, "User-defined connection quantity" } } );
 
     info.insert( { "COFRL", { A::SUMMARY_WELL_COMPLETION, "Oil Flow Rate" } } );
-    info.insert( { "WOFRL", { A::SUMMARY_WELL_COMPLETION, "Oil Flow Rate" } } );
     info.insert( { "COPRL", { A::SUMMARY_WELL_COMPLETION, "Oil Flow Rate" } } );
-    info.insert( { "WOPRL", { A::SUMMARY_WELL_COMPLETION, "Oil Flow Rate" } } );
     info.insert( { "COPTL", { A::SUMMARY_WELL_COMPLETION, "Oil Production Total" } } );
-    info.insert( { "WOPTL", { A::SUMMARY_WELL_COMPLETION, "Oil Production Total" } } );
     info.insert( { "COITL", { A::SUMMARY_WELL_COMPLETION, "Oil Injection Total" } } );
-    info.insert( { "WOITL", { A::SUMMARY_WELL_COMPLETION, "Oil Injection Total" } } );
     info.insert( { "CWFRL", { A::SUMMARY_WELL_COMPLETION, "Water Flow Rate" } } );
-    info.insert( { "WWFRL", { A::SUMMARY_WELL_COMPLETION, "Water Flow Rate" } } );
     info.insert( { "CWPRL", { A::SUMMARY_WELL_COMPLETION, "Water Flow Rate" } } );
-    info.insert( { "WWPRL", { A::SUMMARY_WELL_COMPLETION, "Water Flow Rate" } } );
     info.insert( { "CWPTL", { A::SUMMARY_WELL_COMPLETION, "Water Production Total" } } );
-    info.insert( { "WWPTL", { A::SUMMARY_WELL_COMPLETION, "Water Production Total" } } );
     info.insert( { "CWIRL", { A::SUMMARY_WELL_COMPLETION, "Water Injection Rate" } } );
-    info.insert( { "WWIRL", { A::SUMMARY_WELL_COMPLETION, "Water Injection Rate" } } );
     info.insert( { "CWITL", { A::SUMMARY_WELL_COMPLETION, "Water Injection Total" } } );
-    info.insert( { "WWITL", { A::SUMMARY_WELL_COMPLETION, "Water Injection Total" } } );
     info.insert( { "CGFRL", { A::SUMMARY_WELL_COMPLETION, "Gas Flow Rate" } } );
-    info.insert( { "WGFRL", { A::SUMMARY_WELL_COMPLETION, "Gas Flow Rate" } } );
     info.insert( { "CGPRL", { A::SUMMARY_WELL_COMPLETION, "Gas Flow Rate" } } );
-    info.insert( { "WGPRL", { A::SUMMARY_WELL_COMPLETION, "Gas Flow Rate" } } );
     info.insert( { "CGPTL", { A::SUMMARY_WELL_COMPLETION, "Gas Production Total" } } );
-    info.insert( { "WGPTL", { A::SUMMARY_WELL_COMPLETION, "Gas Production Total" } } );
     info.insert( { "CGIRL", { A::SUMMARY_WELL_COMPLETION, "Gas Injection Rate" } } );
-    info.insert( { "WGIRL", { A::SUMMARY_WELL_COMPLETION, "Gas Injection Rate" } } );
     info.insert( { "CGITL", { A::SUMMARY_WELL_COMPLETION, "Gas Injection Total" } } );
-    info.insert( { "WGITL", { A::SUMMARY_WELL_COMPLETION, "Gas Injection Total" } } );
     info.insert( { "CLFRL", { A::SUMMARY_WELL_COMPLETION, "Liquid Flow Rate" } } );
-    info.insert( { "WLFRL", { A::SUMMARY_WELL_COMPLETION, "Liquid Flow Rate" } } );
     info.insert( { "CLPTL", { A::SUMMARY_WELL_COMPLETION, "Liquid Production Total" } } );
-    info.insert( { "WLPTL", { A::SUMMARY_WELL_COMPLETION, "Liquid Production Total" } } );
     info.insert( { "CVFRL", { A::SUMMARY_WELL_COMPLETION, "Reservoir" } } );
-    info.insert( { "WVFRL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Flow Rate" } } );
     info.insert( { "CVPRL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Production Flow Rate" } } );
-    info.insert( { "WVPRL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Production Flow Rate" } } );
     info.insert( { "CVIRL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Injection Flow Rate" } } );
-    info.insert( { "WVIRL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Injection Flow Rate" } } );
     info.insert( { "CVPTL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Production Total" } } );
-    info.insert( { "WVPTL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Production Total" } } );
     info.insert( { "CVITL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Injection Total" } } );
-    info.insert( { "WVITL", { A::SUMMARY_WELL_COMPLETION, "Res Volume Injection Total" } } );
     info.insert( { "CWCTL", { A::SUMMARY_WELL_COMPLETION, "Water Cut" } } );
-    info.insert( { "WWCTL", { A::SUMMARY_WELL_COMPLETION, "Water Cut" } } );
     info.insert( { "CGORL", { A::SUMMARY_WELL_COMPLETION, "Gas-Oil Ratio" } } );
-    info.insert( { "WGORL", { A::SUMMARY_WELL_COMPLETION, "Gas-Oil Ratio" } } );
     info.insert( { "COGRL", { A::SUMMARY_WELL_COMPLETION, "Oil-Gas Ratio" } } );
-    info.insert( { "WOGRL", { A::SUMMARY_WELL_COMPLETION, "Oil-Gas Ratio" } } );
     info.insert( { "CWGRL", { A::SUMMARY_WELL_COMPLETION, "Water-Gas Ratio" } } );
-    info.insert( { "WWGRL", { A::SUMMARY_WELL_COMPLETION, "Water-Gas Ratio" } } );
     info.insert( { "CGLRL", { A::SUMMARY_WELL_COMPLETION, "Gas-Liquid Ratio" } } );
-    info.insert( { "WGLRL", { A::SUMMARY_WELL_COMPLETION, "Gas-Liquid Ratio" } } );
     info.insert( { "CPRL", { A::SUMMARY_WELL_COMPLETION, "Average Connection Pressure in completion" } } );
     info.insert( { "CKFRL", { A::SUMMARY_WELL_COMPLETION, "Hydrocarbon Component" } } );
     info.insert( { "CKFTL", { A::SUMMARY_WELL_COMPLETION, "Hydrocarbon Component" } } );