diff --git a/Base/Axis/Scale.cpp b/Base/Axis/Scale.cpp
index faf84df19adf4afade0be49d73ef0e20be1c7343..9615e3a2f17f453fc8619b54f7fe36c1e61e5079 100644
--- a/Base/Axis/Scale.cpp
+++ b/Base/Axis/Scale.cpp
@@ -152,7 +152,7 @@ std::ostream& operator<<(std::ostream& ostr, const Scale& ax)
         return ostr;
     }
 
-    ostr << "Scale(\"" << ax.axisName() << "\", [";
+    ostr << "GenericScale(\"" << ax.axisName() << "\", [";
     for (const Bin1D& b : ax.bins())
         ostr << b.lowerBound() << "," << b.upperBound() << ",";
     ostr << "])";
diff --git a/Device/IO/ParseUtil.cpp b/Device/IO/ParseUtil.cpp
index 308df0d6a7938b6c82c1ea92c1b70757532600a6..34bd6dbe68723b5a4f56e14a76beea68c7a9c292 100644
--- a/Device/IO/ParseUtil.cpp
+++ b/Device/IO/ParseUtil.cpp
@@ -69,10 +69,10 @@ Scale* Util::Parse::parseScale(std::istream& input_stream)
         ::readLineOfDoubles(coordinates, iss);
         return newListScan(name, coordinates);
 
-    } else if (type == "Scale") {
+    } else if (type == "GenericScale") {
         std::string name;
         if (!(iss >> name))
-            throw std::runtime_error("Reading Scale: cannot read name");
+            throw std::runtime_error("Reading GenericScale: cannot read name");
         std::vector<double> coordinates;
         ::readLineOfDoubles(coordinates, iss);
         return newGenericScale(name, coordinates);