diff --git a/src/libkst/namedobject.h b/src/libkst/namedobject.h
@@ -28,37 +28,37 @@
 namespace Kst {
 
 // short name index variables
-KSTCORE_EXPORT extern int _vnum; // vectors
-KSTCORE_EXPORT extern int _pnum; // plugins
+KSTCORE_EXPORT extern int _vectornum; // vectors
+KSTCORE_EXPORT extern int _pluginnum; // plugins
 KSTCORE_EXPORT extern int _csdnum; // csd
-KSTCORE_EXPORT extern int _cnum; // curves
-KSTCORE_EXPORT extern int _enum; // equations
-KSTCORE_EXPORT extern int _hnum; // histograms
-KSTCORE_EXPORT extern int _inum; // images
+KSTCORE_EXPORT extern int _curvecnum; // curves
+KSTCORE_EXPORT extern int _equationnum; // equations
+KSTCORE_EXPORT extern int _histogramnum; // histograms
+KSTCORE_EXPORT extern int _imagenum; // images
 KSTCORE_EXPORT extern int _psdnum; // psd
-KSTCORE_EXPORT extern int _xnum; // scalars
-KSTCORE_EXPORT extern int _tnum; // text string
-KSTCORE_EXPORT extern int _mnum; // matrix
+KSTCORE_EXPORT extern int _scalarnum; // scalars
+KSTCORE_EXPORT extern int _stringnum; // text string
+KSTCORE_EXPORT extern int _matrixnum; // matrix
 KSTCORE_EXPORT extern int _plotnum; // plot item
-KSTCORE_EXPORT extern int _lnum; // legend
-KSTCORE_EXPORT extern int _dnum; // view item (drawable)
-KSTCORE_EXPORT extern int _dsnum; // datasource
+KSTCORE_EXPORT extern int _legendnum; // legend
+KSTCORE_EXPORT extern int _viewitemnum; // view item (drawable)
+KSTCORE_EXPORT extern int _datasourcenum; // datasource
 
-KSTCORE_EXPORT extern int max_vnum; // vectors
-KSTCORE_EXPORT extern int max_pnum; // plugins
+KSTCORE_EXPORT extern int max_vectornum; // vectors
+KSTCORE_EXPORT extern int max_pluginnum; // plugins
 KSTCORE_EXPORT extern int max_csdnum; // csd
-KSTCORE_EXPORT extern int max_cnum; // curves
-KSTCORE_EXPORT extern int max_enum; // equations
-KSTCORE_EXPORT extern int max_hnum; // histograms
-KSTCORE_EXPORT extern int max_inum; // images
+KSTCORE_EXPORT extern int max_curvenum; // curves
+KSTCORE_EXPORT extern int max_equationnum; // equations
+KSTCORE_EXPORT extern int max_histogramnum; // histograms
+KSTCORE_EXPORT extern int max_imagenum; // images
 KSTCORE_EXPORT extern int max_psdnum; // psd
-KSTCORE_EXPORT extern int max_xnum; // scalars
-KSTCORE_EXPORT extern int max_tnum; // string
-KSTCORE_EXPORT extern int max_mnum; // matrix
+KSTCORE_EXPORT extern int max_scalarnum; // scalars
+KSTCORE_EXPORT extern int max_stringnum; // string
+KSTCORE_EXPORT extern int max_matrixnum; // matrix
 KSTCORE_EXPORT extern int max_plotnum; // plot item
-KSTCORE_EXPORT extern int max_lnum; // legend
-KSTCORE_EXPORT extern int max_dnum; // view item
-KSTCORE_EXPORT extern int max_dsnum; // datasource
+KSTCORE_EXPORT extern int max_legendnum; // legend
+KSTCORE_EXPORT extern int max_viewitemnum; // view item
+KSTCORE_EXPORT extern int max_datasourcenum; // datasource
 
 struct SizeCache {
     int nameWidthPixels;
@@ -75,21 +75,21 @@ class KSTCORE_EXPORT NamedObject
      virtual ~NamedObject();
 
      enum ShortNameIndex {
-      VNUM   = 0x0001,
-      PNUM   = 0x0002,
-      CSDNUM = 0x0004,
-      CNUM   = 0x0008,
-      ENUM   = 0x0010,
-      HNUM   = 0x0020,
-      INUM   = 0x0040,
-      PSDNUM = 0x0080,
-      XNUM   = 0x0100,
-      TNUM   = 0x0200,
-      MNUM   = 0x0400,
-      PLOTNUM= 0x0800,
-      LNUM   = 0x1000,
-      DNUM   = 0x2000,
-      DSNUM  = 0x4000
+      VECTORNUM    = 0x0001,
+      PLUGINNUM    = 0x0002,
+      CSDNUM       = 0x0004,
+      CURVENUM     = 0x0008,
+      EQUATIONNUM  = 0x0010,
+      HISTOGRAMNUM = 0x0020,
+      IMAGENUM     = 0x0040,
+      PSDNUM       = 0x0080,
+      SCALARNUM    = 0x0100,
+      STRINGNUM    = 0x0200,
+      MATRIXNUM    = 0x0400,
+      PLOTNUM      = 0x0800,
+      LEGENDNUM    = 0x1000,
+      VIEWITEMNUM  = 0x2000,
+      DATASOURCENUM= 0x4000
     };
 
     // name system: see object names devel doc
@@ -116,22 +116,22 @@ class KSTCORE_EXPORT NamedObject
     virtual void saveNameInfo(QXmlStreamWriter &s, unsigned I = 0xffff);
 
     // object indices used for saving/resorting shortnames
-    int _initial_vnum; // vectors
-    int _initial_pnum; // plugins
+    int _initial_vectornum; // vectors
+    int _initial_pluginnum; // plugins
     int _initial_csdnum; // csd
-    int _initial_cnum; // curves
-    int _initial_enum; // equations
-    int _initial_hnum; // histograms
-    int _initial_inum; // images
+    int _initial_curvenum; // curves
+    int _initial_equationnum; // equations
+    int _initial_histogramnum; // histograms
+    int _initial_imagenum; // images
     int _initial_psdnum; // psd
-    int _initial_xnum; // scalars
-    int _initial_tnum; // text string
-    int _initial_mnum; // matrix
+    int _initial_scalarnum; // scalars
+    int _initial_stringnum; // text string
+    int _initial_matrixnum; // matrix
 
     int _initial_plotnum; // plot item
-    int _initial_lnum; // legend
-    int _initial_dnum; // view item
-    int _initial_dsnum; // datasource
+    int _initial_legendnum; // legend
+    int _initial_viewitemnum; // view item
+    int _initial_datasourcenum; // datasource
   private:
     SizeCache *_sizeCache;
 };

diff --git a/src/libkst/scalar.cpp b/src/libkst/scalar.cpp
@@ -38,10 +38,10 @@ Scalar::Scalar(ObjectStore *store)
 }
 
 void Scalar::_initializeShortName() {
-  _shortName = 'X'+QString::number(_xnum);
-  if (_xnum>max_xnum)
-    max_xnum = _xnum;
-  _xnum++;
+  _shortName = 'X'+QString::number(_scalarnum);
+  if (_scalarnum>max_scalarnum)
+    max_scalarnum = _scalarnum;
+  _scalarnum++;
 }
 
 Scalar::~Scalar() {
@@ -78,7 +78,7 @@ void Scalar::save(QXmlStreamWriter &s) {
     s.writeAttribute("hidden", "true");
   }
   s.writeAttribute("value", QString::number(value()));
-  saveNameInfo(s, XNUM);
+  saveNameInfo(s, SCALARNUM);
   s.writeEndElement();
 }
 

diff --git a/src/libkst/shortnameindex.cpp b/src/libkst/shortnameindex.cpp
@@ -14,35 +14,35 @@
 
 namespace Kst 
 {
-  int _vnum = 1; // vectors
-  int _pnum = 1; // plugins
+  int _vectornum = 1; // vectors
+  int _pluginnum = 1; // plugins
   int _csdnum = 1; // csd
-  int _cnum = 1; // curves
-  int _enum = 1; // equations
-  int _hnum = 1; // histograms
-  int _inum = 1; // images
+  int _curvecnum = 1; // curves
+  int _equationnum = 1; // equations
+  int _histogramnum = 1; // histograms
+  int _imagenum = 1; // images
   int _psdnum = 1; // psd
-  int _xnum = 1; // scalars
-  int _tnum = 1; // text string
-  int _mnum = 1; // matrix
+  int _scalarnum = 1; // scalars
+  int _stringnum = 1; // text string
+  int _matrixnum = 1; // matrix
   int _plotnum = 1; // plots
-  int _lnum = 1; // legend
-  int _dnum = 1; // view item
-  int _dsnum = 1; // datasource
+  int _legendnum = 1; // legend
+  int _viewitemnum = 1; // view item
+  int _datasourcenum = 1; // datasource
 
-  int max_vnum = 0; // vectors
-  int max_pnum = 0; // plugins
+  int max_vectornum = 0; // vectors
+  int max_pluginnum = 0; // plugins
   int max_csdnum = 0; // csd
-  int max_cnum = 0; // curves
-  int max_enum = 0; // equations
-  int max_hnum = 0; // histograms
-  int max_inum = 0; // images
+  int max_curvenum = 0; // curves
+  int max_equationnum = 0; // equations
+  int max_histogramnum = 0; // histograms
+  int max_imagenum = 0; // images
   int max_psdnum = 0; // psd
-  int max_xnum = 0; // scalars
-  int max_tnum = 0; // text string
-  int max_mnum = 0; // matrix
+  int max_scalarnum = 0; // scalars
+  int max_stringnum = 0; // text string
+  int max_matrixnum = 0; // matrix
   int max_plotnum = 0; // plots
-  int max_lnum = 0; // legends
-  int max_dnum = 0; // view item
-  int max_dsnum = 0; // datasource
+  int max_legendnum = 0; // legends
+  int max_viewitemnum = 0; // view item
+  int max_datasourcenum = 0; // datasource
 }
diff --git a/src/libkst/string_kst.cpp b/src/libkst/string_kst.cpp
@@ -42,10 +42,10 @@ ScriptInterface* String::createScriptInterface() {
 
 
 void String::_initializeShortName() {
-  _shortName = 'T'+QString::number(_tnum);
-  if (_tnum>max_tnum)
-    max_tnum = _tnum;
-  _tnum++;
+  _shortName = 'T'+QString::number(_stringnum);
+  if (_stringnum>max_stringnum)
+    max_stringnum = _stringnum;
+  _stringnum++;
 }
 
 
@@ -70,7 +70,7 @@ void String::save(QXmlStreamWriter &s) {
     s.writeAttribute("editable", "true");
   }
   s.writeAttribute("value", value());
-  saveNameInfo(s, TNUM);
+  saveNameInfo(s, STRINGNUM);
   s.writeEndElement();
 }
 

diff --git a/src/libkst/vector.cpp b/src/libkst/vector.cpp
@@ -89,10 +89,10 @@ Vector::Vector(ObjectStore *store)
 }
 
 void Vector::_initializeShortName() {
-  _shortName = 'V'+QString::number(_vnum);
-  if (_vnum>max_vnum)
-    max_vnum = _vnum;
-  _vnum++;
+  _shortName = 'V'+QString::number(_vectornum);
+  if (_vectornum>max_vectornum)
+    max_vectornum = _vectornum;
+  _vectornum++;
 }
 
 Vector::~Vector() {
@@ -689,7 +689,7 @@ void Vector::save(QXmlStreamWriter &s) {
 
     s.writeTextElement("data_v2", qCompress(qba).toBase64());
   }
-  saveNameInfo(s, VNUM|XNUM);
+  saveNameInfo(s, VECTORNUM|SCALARNUM);
   s.writeEndElement();
 }
 

diff --git a/src/libkst/vscalar.cpp b/src/libkst/vscalar.cpp
@@ -114,7 +114,7 @@ void VScalar::save(QXmlStreamWriter &s) {
     s.writeAttribute("field", _field);
     s.writeAttribute("f0", QString::number(_f0));
 
-    saveNameInfo(s, XNUM);
+    saveNameInfo(s, SCALARNUM);
     s.writeEndElement();
   }
 }

diff --git a/src/libkstapp/document.cpp b/src/libkstapp/document.cpp
@@ -418,17 +418,17 @@ bool Document::open(const QString& file) {
     return false;
   }
 
-  _vnum = max_vnum+1;
-  _xnum = max_xnum+1;
-  _pnum = max_pnum+1;
+  _vectornum = max_vectornum+1;
+  _scalarnum = max_scalarnum+1;
+  _pluginnum = max_pluginnum+1;
   _csdnum = max_csdnum+1;
-  _cnum = max_cnum+1;
-  _enum = max_enum+1;
-  _hnum = max_hnum+1;
-  _inum = max_inum+1;
+  _curvecnum = max_curvenum+1;
+  _equationnum = max_equationnum+1;
+  _histogramnum = max_histogramnum+1;
+  _imagenum = max_imagenum+1;
   _psdnum = max_psdnum+1;
-  _tnum = max_tnum+1;
-  _mnum = max_mnum+1;
+  _stringnum = max_stringnum+1;
+  _matrixnum = max_matrixnum+1;
 
 
   if (_win->tabWidget()->count() > currentTab) {

diff --git a/src/libkstapp/legenditem.cpp b/src/libkstapp/legenditem.cpp
@@ -54,10 +54,10 @@ LegendItem::LegendItem(PlotItem *parentPlot)
 }
 
 void LegendItem::_initializeShortName() {
-  _shortName = 'L'+QString::number(_lnum);
-  if (_lnum>max_lnum)
-    max_lnum = _lnum;
-  _lnum++;
+  _shortName = 'L'+QString::number(_legendnum);
+  if (_legendnum>max_legendnum)
+    max_legendnum = _legendnum;
+  _legendnum++;
 }
 
 

diff --git a/src/libkstapp/viewitem.cpp b/src/libkstapp/viewitem.cpp
@@ -142,10 +142,10 @@ ViewItem::~ViewItem() {
 }
 
 void ViewItem::_initializeShortName() {
-  _shortName = 'D'+QString::number(_dnum);
-  if (_dnum>max_dnum)
-    max_dnum = _dnum;
-  _dnum++;
+  _shortName = 'D'+QString::number(_viewitemnum);
+  if (_viewitemnum>max_viewitemnum)
+    max_viewitemnum = _viewitemnum;
+  _viewitemnum++;
 
 }
 

diff --git a/src/libkstmath/basicplugin.cpp b/src/libkstmath/basicplugin.cpp
@@ -47,10 +47,10 @@ BasicPlugin::~BasicPlugin() {
 }
 
 void BasicPlugin::_initializeShortName() {
-  _shortName = 'P'+QString::number(_pnum);
-  if (_pnum>max_pnum)
-    max_pnum = _pnum;
-  _pnum++;
+  _shortName = 'P'+QString::number(_pluginnum);
+  if (_pluginnum>max_pluginnum)
+    max_pluginnum = _pluginnum;
+  _pluginnum++;
 
 }
 
@@ -281,7 +281,7 @@ static void writeVectors(T& vectors, const QString& element, QXmlStreamWriter& s
 void BasicPlugin::save(QXmlStreamWriter &stream) {
   stream.writeStartElement(staticTypeTag);
   stream.writeAttribute("type", _pluginName);
-  saveNameInfo(stream, VNUM|PNUM|XNUM);
+  saveNameInfo(stream, VECTORNUM|PLUGINNUM|SCALARNUM);
 
   writeVectors(_inputVectors, "inputvector", stream, &NamedObject::Name);
   writeVectors(_inputScalars, "inputscalar", stream, &NamedObject::Name);

diff --git a/src/libkstmath/csd.cpp b/src/libkstmath/csd.cpp
@@ -160,7 +160,7 @@ void CSD::save(QXmlStreamWriter &s) {
   s.writeAttribute("vectorunits", _vectorUnits);
   s.writeAttribute("rateunits", _rateUnits);
   s.writeAttribute("outputtype", QString::number(_outputType));
-  saveNameInfo(s,VNUM|XNUM|MNUM|CSDNUM);
+  saveNameInfo(s,VECTORNUM|SCALARNUM|MATRIXNUM|CSDNUM);
 
   s.writeEndElement();
 }

diff --git a/src/libkstmath/curve.cpp b/src/libkstmath/curve.cpp
@@ -92,10 +92,10 @@ Curve::Curve(ObjectStore *store)
 }
 
 void Curve::_initializeShortName() {
-  _shortName = 'C'+QString::number(_cnum);
-  if (_cnum>max_cnum)
-    max_cnum = _cnum;
-  _cnum++;
+  _shortName = 'C'+QString::number(_curvecnum);
+  if (_curvecnum>max_curvenum)
+    max_curvenum = _curvecnum;
+  _curvecnum++;
 }
 
 
@@ -319,7 +319,7 @@ void Curve::save(QXmlStreamWriter &s) {
   s.writeAttribute("hashead", QVariant(HasHead).toString());
   s.writeAttribute("headtype", QString::number(HeadType));
 
-  saveNameInfo(s, CNUM);
+  saveNameInfo(s, CURVENUM);
 
   s.writeEndElement();
 }

diff --git a/src/libkstmath/equation.cpp b/src/libkstmath/equation.cpp
@@ -88,10 +88,10 @@ Equation::~Equation() {
 }
 
 void Equation::_initializeShortName() {
-  _shortName = 'E'+QString::number(_enum);
-  if (_enum>max_enum)
-    max_enum = _enum;
-  _enum++;
+  _shortName = 'E'+QString::number(_equationnum);
+  if (_equationnum>max_equationnum)
+    max_equationnum = _equationnum;
+  _equationnum++;
 }
 
 
@@ -219,7 +219,7 @@ void Equation::save(QXmlStreamWriter &s) {
   if (_doInterp) {
     s.writeAttribute("interpolate", "true");
   }
-  saveNameInfo(s, VNUM|ENUM|XNUM);
+  saveNameInfo(s, VECTORNUM|EQUATIONNUM|SCALARNUM);
   s.writeEndElement();
 }
 

diff --git a/src/libkstmath/histogram.cpp b/src/libkstmath/histogram.cpp
@@ -66,10 +66,10 @@ Histogram::Histogram(ObjectStore *store)
 }
 
 void Histogram::_initializeShortName() {
-  _shortName = 'H'+QString::number(_hnum);
-  if (_hnum>max_hnum)
-    max_hnum = _hnum;
-  _hnum++;
+  _shortName = 'H'+QString::number(_histogramnum);
+  if (_histogramnum>max_histogramnum)
+    max_histogramnum = _histogramnum;
+  _histogramnum++;
 }
 
 
@@ -296,7 +296,7 @@ void Histogram::save(QXmlStreamWriter &xml) {
   xml.writeAttribute("min", QString::number(_MinX));
   xml.writeAttribute("max", QString::number(_MaxX));
   xml.writeAttribute("normalizationmode", QString::number(_NormalizationMode));
-  saveNameInfo(xml, VNUM|HNUM|XNUM);
+  saveNameInfo(xml, VECTORNUM|HISTOGRAMNUM|SCALARNUM);
 
   xml.writeEndElement();
 }

diff --git a/src/libkstmath/image.cpp b/src/libkstmath/image.cpp
@@ -56,10 +56,10 @@ Image::~Image() {
 }
 
 void Image::_initializeShortName() {
-  _shortName = 'I'+QString::number(_inum);
-  if (_inum>max_inum)
-    max_inum = _inum;
-  _inum++;
+  _shortName = 'I'+QString::number(_imagenum);
+  if (_imagenum>max_imagenum)
+    max_imagenum = _imagenum;
+  _imagenum++;
 }
 
 ScriptInterface* Image::createScriptInterface() {
@@ -86,7 +86,7 @@ void Image::save(QXmlStreamWriter &s) {
   s.writeAttribute("contourcolor", _contourColor.name());
 
   s.writeAttribute("autothreshold", QVariant(_autoThreshold).toString());
-  saveNameInfo(s, INUM);
+  saveNameInfo(s, IMAGENUM);
   s.writeEndElement();
 }
 

diff --git a/src/libkstmath/psd.cpp b/src/libkstmath/psd.cpp
@@ -222,7 +222,7 @@ void PSD::save(QXmlStreamWriter &s) {
   s.writeAttribute("vectorunits", _vectorUnits);
   s.writeAttribute("rateunits", _rateUnits);
   s.writeAttribute("outputtype", QString::number(_Output));
-  saveNameInfo(s, VNUM|PSDNUM|XNUM);
+  saveNameInfo(s, VECTORNUM|PSDNUM|SCALARNUM);
 
   s.writeEndElement();
 }