TQt4 port piklab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

485 files changed, 16498 insertions, 16467 deletions

diff --git a/src/devices/base/device_group.cpp b/src/devices/base/device_group.cpp
index df230d1..4b9d75d 100644
--- a/src/devices/base/device_group.cpp
+++ b/src/devices/base/device_group.cpp
@@ -9,32 +9,32 @@
 #include "device_group.h"
 
 #if !defined(NO_KDE)
-#  include <qpainter.h>
+#  include <tqpainter.h>
 #  include <kglobal.h>
 
-QColor Device::statusColor(Status status)
+TQColor Device::statusColor(tqStatus status)
 {
   switch (status.type()) {
-    case Status::Future:         return Qt::blue;
-    case Status::InProduction:   return Qt::green;
-    case Status::Mature:
-    case Status::NotRecommended: return QColor("orange");
-    case Status::EOL:            return Qt::red;
-    case Status::Unknown:
-    case Status::Nb_Types: break;
+    case tqStatus::Future:         return TQt::blue;
+    case tqStatus::InProduction:   return TQt::green;
+    case tqStatus::Mature:
+    case tqStatus::NotRecommended: return TQColor("orange");
+    case tqStatus::EOL:            return TQt::red;
+    case tqStatus::Unknown:
+    case tqStatus::Nb_Types: break;
   }
-  return Qt::black;
+  return TQt::black;
 }
 
-QString coloredString(const QString &text, QColor color)
+TQString coloredString(const TQString &text, TQColor color)
 {
-  return QString("<font color=\"") + color.name() + "\">" + text + "</font>";
+  return TQString("<font color=\"") + color.name() + "\">" + text + "</font>";
 }
 
-QString supportedString(bool supported)
+TQString supportedString(bool supported)
 {
   return coloredString(supported ? i18n("Supported") : i18n("Unsupported"),
-                       supported ? Qt::green :  Qt::red);
+                       supported ? TQt::green :  TQt::red);
 }
 
 class Tick {
@@ -44,27 +44,27 @@ public:
     s = KGlobal::locale()->formatNumber(value, 1);
     min = oValue;
   }
-  QString s;
+  TQString s;
   double min;
 };
 
-class TickMap : public QMap<double, Tick>
+class TickMap : public TQMap<double, Tick>
 {
 public:
   TickMap() {}
   void add(double value, double oValue) {
     insert(value, Tick(value, oValue), false);
-    (*this)[value].min = QMIN((*this)[value].min, oValue);
+    (*this)[value].min = TQMIN((*this)[value].min, oValue);
   }
 };
 
-QPixmap drawGraph(const QValueVector<Device::RangeBox> &boxes)
+TQPixmap drawGraph(const TQValueVector<Device::RangeBox> &boxes)
 {
   const uint w = 300, h = 200;
-  QPixmap pixmap(w, h);
-  pixmap.fill(Qt::white);
-  QPainter p(&pixmap);
-  QFontMetrics f(p.font());
+  TQPixmap pixmap(w, h);
+  pixmap.fill(TQt::white);
+  TQPainter p(&pixmap);
+  TQFontMetrics f(p.font());
   TickMap xTicks, yTicks;
   xTicks.add(0.0, 0.0);
   yTicks.add(0.0, 0.0);
@@ -85,67 +85,67 @@ QPixmap drawGraph(const QValueVector<Device::RangeBox> &boxes)
   int yStart = h-1 - f.lineSpacing();
   TickMap::const_iterator it = xTicks.begin();
   for (; it!=xTicks.end(); ++it) {
-    xStart = QMAX(xStart, f.width(it.data().s));
-    xMax = QMAX(xMax, it.key());
+    xStart = TQMAX(xStart, f.width(it.data().s));
+    xMax = TQMAX(xMax, it.key());
   }
   for (it = yTicks.begin(); it!=yTicks.end(); ++it)
-    yMax = QMAX(yMax, it.key());
+    yMax = TQMAX(yMax, it.key());
   int xEnd = w-1 - f.width(xTicks[xMax].s)/2;
-  QRect rect = f.boundingRect(yTicks[yMax].s);
+  TQRect rect = f.boundingRect(yTicks[yMax].s);
   int yEnd = rect.height()/2;
 
   // draw boxes
-  p.setPen(Qt::lightGray);
-  p.setBrush(Qt::lightGray);
+  p.setPen(TQt::lightGray);
+  p.setBrush(TQt::lightGray);
   for (uint i=0; i<boxes.count(); i++) {
     double ax = double(xEnd - xStart)/xMax;
     double ay = double(yEnd - yStart)/yMax;
-    QPointArray pa(4);
-    pa.setPoint(0, qRound(ax*boxes[i].start.x), qRound(ay*boxes[i].start.yMin));
-    pa.setPoint(1, qRound(ax*boxes[i].end.x), qRound(ay*boxes[i].end.yMin));
-    pa.setPoint(2, qRound(ax*boxes[i].end.x), qRound(ay*boxes[i].end.yMax));
-    pa.setPoint(3, qRound(ax*boxes[i].start.x), qRound(ay*boxes[i].start.yMax));
+    TQPointArray pa(4);
+    pa.setPoint(0, tqRound(ax*boxes[i].start.x), tqRound(ay*boxes[i].start.yMin));
+    pa.setPoint(1, tqRound(ax*boxes[i].end.x), tqRound(ay*boxes[i].end.yMin));
+    pa.setPoint(2, tqRound(ax*boxes[i].end.x), tqRound(ay*boxes[i].end.yMax));
+    pa.setPoint(3, tqRound(ax*boxes[i].start.x), tqRound(ay*boxes[i].start.yMax));
     pa.translate(xStart, yStart);
     p.drawPolygon(pa);
   }
 
   // draw axis
-  p.setPen(Qt::black);
+  p.setPen(TQt::black);
   p.drawLine(xStart, yStart, w-1, yStart);
   p.drawLine(xStart, yStart, xStart, 0);
 
   // draw ticks and lines
-  p.setPen(Qt::DotLine);
+  p.setPen(TQt::DotLine);
   for (it = yTicks.begin(); it!=yTicks.end(); ++it) {
-    int y1 = yStart + qRound(it.key()*(yEnd-yStart)/yMax);
-    QRect rect = f.boundingRect(it.data().s);
+    int y1 = yStart + tqRound(it.key()*(yEnd-yStart)/yMax);
+    TQRect rect = f.boundingRect(it.data().s);
     p.drawText(xStart/2-rect.width()/2 , y1+rect.height()/2, it.data().s);
-    int xmin = xStart + qRound(it.data().min*(xEnd-xStart)/xMax);
+    int xmin = xStart + tqRound(it.data().min*(xEnd-xStart)/xMax);
     p.drawLine(xStart, y1, xmin, y1);
   }
   for (it = xTicks.begin(); it!=xTicks.end(); ++it) {
-    int x1 = xStart + qRound(it.key()*(xEnd-xStart)/xMax);
-    QRect rect = f.boundingRect(it.data().s);
+    int x1 = xStart + tqRound(it.key()*(xEnd-xStart)/xMax);
+    TQRect rect = f.boundingRect(it.data().s);
     p.drawText(x1-rect.width()/2, h-1, it.data().s);
-    int ymin = yStart + qRound(it.data().min*(yEnd-yStart)/yMax);
+    int ymin = yStart + tqRound(it.data().min*(yEnd-yStart)/yMax);
     p.drawLine(x1, yStart, x1, ymin);
   }
 
   return pixmap;
 }
 
-QPixmap Device::vddGraph(const QString &xLabel, const QString &yLabel,
-                         const QValueVector<Device::RangeBox> &boxes)
+TQPixmap Device::vddGraph(const TQString &xLabel, const TQString &yLabel,
+                         const TQValueVector<Device::RangeBox> &boxes)
 {
   uint sp = 10;
-  QPixmap graph = drawGraph(boxes);
-  QPainter p;
-  QFontMetrics f(p.font());
-  QPixmap pixmap(graph.width() + sp + f.width(xLabel), graph.height() + sp + f.lineSpacing());
-  pixmap.fill(Qt::white);
+  TQPixmap graph = drawGraph(boxes);
+  TQPainter p;
+  TQFontMetrics f(p.font());
+  TQPixmap pixmap(graph.width() + sp + f.width(xLabel), graph.height() + sp + f.lineSpacing());
+  pixmap.fill(TQt::white);
   copyBlt(&pixmap, 0, f.lineSpacing() + sp, &graph, 0, 0, graph.width(), graph.height());
   p.begin(&pixmap);
-  p.setPen(Qt::black);
+  p.setPen(TQt::black);
   p.drawText(0, f.lineSpacing(), yLabel);
   p.drawText(pixmap.width()-1-f.width(xLabel), pixmap.height()-1, xLabel);
   return pixmap;
@@ -159,31 +159,31 @@ const Device::Package *Device::barPackage(const char *name, const Device::Data &
   return 0;
 }
 
-QPixmap Device::pinsGraph(const Device::Package &package)
+TQPixmap Device::pinsGraph(const Device::Package &package)
 {
-  QPixmap pixmap;
-  QPainter p;
-  QFontMetrics fm(p.font());
+  TQPixmap pixmap;
+  TQPainter p;
+  TQFontMetrics fm(p.font());
   uint nb = package.pins.count();
   const int hspacing = 3, wspacing = 3, wmark = 10, wpin = 4;
   int theight = fm.ascent() + (fm.ascent()%2==0 ? 1 : 0);
   int height = hspacing + (nb/2)*(hspacing + theight);
   int wnumber = fm.width("1");
-  wnumber = QMAX(wnumber, fm.width(QString::number(nb/2)));
-  wnumber = QMAX(wnumber, fm.width(QString::number(nb/2+1)));
-  wnumber = QMAX(wnumber, fm.width(QString::number(nb)));
+  wnumber = TQMAX(wnumber, fm.width(TQString::number(nb/2)));
+  wnumber = TQMAX(wnumber, fm.width(TQString::number(nb/2+1)));
+  wnumber = TQMAX(wnumber, fm.width(TQString::number(nb)));
   int bwidth = 4*wspacing + 2*wnumber + wmark;
   int lwidth = 0, rwidth = 0;
   for (uint k=0; k<nb/2; k++) {
-    lwidth = QMAX(lwidth, fm.width(package.pins[k]));
-    rwidth = QMAX(rwidth, fm.width(package.pins[nb-k-1]));
+    lwidth = TQMAX(lwidth, fm.width(package.pins[k]));
+    rwidth = TQMAX(rwidth, fm.width(package.pins[nb-k-1]));
   }
   int bx = lwidth + wspacing + wpin;
   int width = bx + bwidth + wpin + wspacing + rwidth;
   pixmap.resize(width, height);
-  pixmap.fill(Qt::white);
+  pixmap.fill(TQt::white);
   p.begin(&pixmap);
-  p.setPen(QPen(Qt::black, 2));
+  p.setPen(TQPen(TQt::black, 2));
   p.drawRect(bx, 1, bwidth, height-1);
   p.drawArc(bx+wspacing+wnumber+wspacing, -wmark/2+2, wmark, wmark, 0, -180*16);
   for (uint k=0; k<nb/2; k++) {
@@ -191,13 +191,13 @@ QPixmap Device::pinsGraph(const Device::Package &package)
     p.drawLine(bx-wpin-1, h, bx, h);
     p.drawLine(bx+bwidth, h, bx+bwidth+wpin, h);
     h += theight/2;
-    QString label = package.pins[k];
+    TQString label = package.pins[k];
     p.drawText(bx-wpin-wspacing-fm.width(label), h, label);
     p.drawText(bx+bwidth+wpin+wspacing, h, package.pins[nb-k-1]);
     uint pin = (k+1);
     if ( pin==1 || pin==(nb/2) ) {
-      p.drawText(bx+wspacing, h, QString::number(pin));
-      label = QString::number(nb-k);
+      p.drawText(bx+wspacing, h, TQString::number(pin));
+      label = TQString::number(nb-k);
       p.drawText(bx+bwidth-wspacing-fm.width(label), h, label);
     }
   }
@@ -205,9 +205,9 @@ QPixmap Device::pinsGraph(const Device::Package &package)
   return pixmap;
 }
 
-QString Device::htmlInfo(const Device::Data &data, const QString &deviceHref, const QString &documentHtml)
+TQString Device::htmlInfo(const Device::Data &data, const TQString &deviceHref, const TQString &documentHtml)
 {
-  QString doc;
+  TQString doc;
 
   // title
   doc += "<h1>";
@@ -224,16 +224,16 @@ QString Device::htmlInfo(const Device::Data &data, const QString &deviceHref, co
   doc += "</h1>";
 
   doc += "<table>";
-  QString status = coloredString(data.status().label(), statusColor(data.status()));
-  doc += htmlTableRow(i18n("Status"), status);
+  TQString status = coloredString(data.status().label(), statusColor(data.status()));
+  doc += htmlTableRow(i18n("tqStatus"), status);
   if ( data.alternatives().count() ) {
-    QString s;
+    TQString s;
     for (uint i=0; i<data.alternatives().count(); i++) {
       if ( i!=0 ) s += ", ";
       if ( deviceHref.isEmpty() ) s += data.alternatives()[i].upper();
       else {
-        QString href = deviceHref.arg(data.alternatives()[i].upper());
-        s += QString("<a href=\"%1\">%2</a>").arg(href).arg(data.alternatives()[i].upper());
+        TQString href = deviceHref.tqarg(data.alternatives()[i].upper());
+        s += TQString("<a href=\"%1\">%2</a>").tqarg(href).tqarg(data.alternatives()[i].upper());
       }
     }
     doc += htmlTableRow(i18n("Alternatives"), s);
@@ -244,36 +244,36 @@ QString Device::htmlInfo(const Device::Data &data, const QString &deviceHref, co
   doc += "<hr />";
   doc += "<table>";
   doc += data.group().informationHtml(data);
-  QString s;
+  TQString s;
   for (uint i=0; i<data.packages().count(); i++)
     for (uint k=0; k<data.packages()[i].types.count(); k++)
-      s += i18n(Package::TYPE_DATA[data.packages()[i].types[k]].label) + QString("[%1] ").arg(data.packages()[i].pins.count());
+      s += i18n(Package::TYPE_DATA[data.packages()[i].types[k]].label) + TQString("[%1] ").tqarg(data.packages()[i].pins.count());
   doc += htmlTableRow(i18n("Packaging"), s);
   doc += "</table>";
 
   return doc;
 }
 
-QString Device::htmlPinDiagrams(const Device::Data &data, const QString &imagePrefix, QMimeSourceFactory *msf)
+TQString Device::htmlPinDiagrams(const Device::Data &data, const TQString &imagePrefix, TQMimeSourceFactory *msf)
 {
-  QString doc;
+  TQString doc;
   // pins
   const Package *package = 0;
   for (uint i=0; Package::TYPE_DATA[i].name; i++) {
-    if ( Package::TYPE_DATA[i].shape!=Package::Bar ) continue;
+    if ( Package::TYPE_DATA[i].tqshape!=Package::Bar ) continue;
     package = barPackage(Package::TYPE_DATA[i].name, data);
     if (package) break;
   }
   if (package) {
-    QPixmap pix = pinsGraph(*package);
+    TQPixmap pix = pinsGraph(*package);
     doc += "<table cellpadding=\"3\"><tr bgcolor=\"gray\"><th align=\"center\">";
     for (uint k=0; k<package->types.count(); k++) {
       if ( k!=0 ) doc += " ";
       doc += i18n(Package::TYPE_DATA[package->types[k]].label);
-      doc += "(" + QString::number(package->pins.count()) + ")";
+      doc += "(" + TQString::number(package->pins.count()) + ")";
     }
     doc += "</th></tr><tr><td align=\"center\">";
-    QString label = data.name() + "_pins_graph.png";
+    TQString label = data.name() + "_pins_graph.png";
     doc += "<img src=\"" + imagePrefix + label + "\" />";
     if (msf) msf->setPixmap(label, pix);
     doc += "</td></tr></table>";
@@ -281,15 +281,15 @@ QString Device::htmlPinDiagrams(const Device::Data &data, const QString &imagePr
   return doc;
 }
 
-QString Device::htmlVoltageFrequencyGraphs(const Device::Data &data, const QString &imagePrefix, QMimeSourceFactory *msf)
+TQString Device::htmlVoltageFrequencyGraphs(const Device::Data &data, const TQString &imagePrefix, TQMimeSourceFactory *msf)
 {
-  QString doc;
+  TQString doc;
   FOR_EACH(Special, special) {
     for (uint k=0; k<data.frequencyRanges().count(); k++) {
       const Device::FrequencyRange &fr = data.frequencyRanges()[k];
       if ( fr.special!=special ) continue;
       doc += "<h3>" + data.fname(special) + " - " + i18n("Temperature range: ") + fr.operatingCondition.label() + "</h3>";
-      QString label = data.name() + "_" + data.fname(special) + "_"
+      TQString label = data.name() + "_" + data.fname(special) + "_"
         + fr.operatingCondition.key() + ".png";
       doc += "<img src=\"" + imagePrefix + label + "\" />";
       if (msf) msf->setPixmap(label, Device::vddGraph(i18n("F (MHz)"), i18n("Vdd (V)"), fr.vdds));
@@ -298,18 +298,18 @@ QString Device::htmlVoltageFrequencyGraphs(const Device::Data &data, const QStri
   return doc;
 }
 
-QPixmap Device::memoryGraph(const QValueList<MemoryGraphData> &r)
+TQPixmap Device::memoryGraph(const TQValueList<MemoryGraphData> &r)
 {
-  QValueList<MemoryGraphData> ranges = r;
-  QPixmap pixmap;
-  QPainter p;
-  QFontMetrics fm(p.font());
+  TQValueList<MemoryGraphData> ranges = r;
+  TQPixmap pixmap;
+  TQPainter p;
+  TQFontMetrics fm(p.font());
   // order
   qHeapSort(ranges);
   // add empty ranges
-  QValueList<MemoryGraphData>::iterator it;
+  TQValueList<MemoryGraphData>::iterator it;
   for (it=ranges.begin(); it!=ranges.end(); ) {
-    QValueList<MemoryGraphData>::iterator prev = it;
+    TQValueList<MemoryGraphData>::iterator prev = it;
     ++it;
     if ( it==ranges.end() ) break;
     if ( (*prev).endAddress+1==(*it).startAddress ) continue;
@@ -324,9 +324,9 @@ QPixmap Device::memoryGraph(const QValueList<MemoryGraphData> &r)
   int height = 1;
   int w1 = 0, w2 = 0;
   for (it=ranges.begin(); it!=ranges.end(); ++it) {
-    w1 = QMAX(w1, fm.width((*it).start));
-    w1 = QMAX(w1, fm.width((*it).end));
-    w2 = QMAX(w2, fm.width((*it).label));
+    w1 = TQMAX(w1, fm.width((*it).start));
+    w1 = TQMAX(w1, fm.width((*it).end));
+    w2 = TQMAX(w2, fm.width((*it).label));
     (*it).height = 2*hspacing + theight;
     if ( (*it).startAddress!=(*it).endAddress ) (*it).height += 2*theight;
     height += (*it).height;
@@ -334,15 +334,15 @@ QPixmap Device::memoryGraph(const QValueList<MemoryGraphData> &r)
   int wspacing = 4;
   int width = wspacing + w1 + wspacing + wspacing + w2;
   pixmap.resize(width, height);
-  pixmap.fill(Qt::white);
+  pixmap.fill(TQt::white);
   p.begin(&pixmap);
   int h = 0;
   // draw ranges
   for (it=ranges.begin(); it!=ranges.end(); ++it) {
-    p.setPen(QPen(Qt::black, 1, Qt::DotLine));
+    p.setPen(TQPen(TQt::black, 1, TQt::DotLine));
     p.drawLine(0,h, width-1,h);
-    p.setPen(QPen(Qt::black, 1));
-    p.setBrush((*it).label.isEmpty() ? Qt::gray : Qt::white);
+    p.setPen(TQPen(TQt::black, 1));
+    p.setBrush((*it).label.isEmpty() ? TQt::gray : TQt::white);
     p.drawRect(0,h, wspacing+w1+wspacing,(*it).height+1);
     int hmid = h+(*it).height/2+theight/2;
     p.drawText(wspacing+w1+wspacing+wspacing,hmid, (*it).label);
@@ -352,7 +352,7 @@ QPixmap Device::memoryGraph(const QValueList<MemoryGraphData> &r)
       p.drawText(wspacing,h+(*it).height-3, (*it).end);
     }
     h += (*it).height;
-    p.setPen(QPen(Qt::black, 1, Qt::DotLine));
+    p.setPen(TQPen(TQt::black, 1, TQt::DotLine));
     p.drawLine(0,h, width-1,h);
   }
   p.end();
diff --git a/src/devices/base/device_group.h b/src/devices/base/device_group.h
index 087ca99..8414515 100644
--- a/src/devices/base/device_group.h
+++ b/src/devices/base/device_group.h
@@ -10,7 +10,7 @@
 #define DEVICE_GROUP_H
 
 #if !defined(NO_KDE)
-#  include <qcolor.h>
+#  include <tqcolor.h>
 #endif
 
 #include "generic_device.h"
@@ -35,13 +35,13 @@ class GroupBase : public ::Group::Base
 {
 public:
   virtual Memory *createMemory(const Device::Data &data) const = 0;
-  virtual QString informationHtml(const Device::Data &data) const = 0;
+  virtual TQString informationHtml(const Device::Data &data) const = 0;
 #if !defined(NO_KDE)
-  virtual QPixmap memoryGraph(const Device::Data &data) const = 0;
+  virtual TQPixmap memoryGraph(const Device::Data &data) const = 0;
 #endif
 
 protected:
-  virtual void addDevice(const QString &name, const Device::Data *data, ::Group::Support support) {
+  virtual void addDevice(const TQString &name, const Device::Data *data, ::Group::Support support) {
     const_cast<Device::Data *>(data)->_group = this;
     ::Group::Base::addDevice(name, data, support);
   }
@@ -52,7 +52,7 @@ class Group : public GroupBase, public DataStreamer<DataType>
 {
 protected:
   virtual void initSupported() {
-    QValueList<DataType *> list = fromCppString(dataStream(), dataSize());
+    TQValueList<DataType *> list = fromCppString(dataStream(), dataSize());
     for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested);
   }
   virtual uint dataSize() const = 0;
@@ -61,24 +61,24 @@ protected:
 
 //----------------------------------------------------------------------------
 #if !defined(NO_KDE)
-extern QColor statusColor(Status status);
-extern QPixmap vddGraph(const QString &xLabel, const QString &yLabel, const QValueVector<RangeBox> &boxes);
+extern TQColor statusColor(tqStatus status);
+extern TQPixmap vddGraph(const TQString &xLabel, const TQString &yLabel, const TQValueVector<RangeBox> &boxes);
 extern const Package *barPackage(const char *name, const Data &data);
-extern QPixmap pinsGraph(const Package &package);
+extern TQPixmap pinsGraph(const Package &package);
 
-extern QString htmlInfo(const Data &data, const QString &deviceHref, const QString &documentHtml);
-extern QString htmlPinDiagrams(const Device::Data &data, const QString &imagePrefix, QMimeSourceFactory *msf);
-extern QString htmlVoltageFrequencyGraphs(const Device::Data &data, const QString &imagePrefix, QMimeSourceFactory *msf);
+extern TQString htmlInfo(const Data &data, const TQString &deviceHref, const TQString &documentHtml);
+extern TQString htmlPinDiagrams(const Device::Data &data, const TQString &imagePrefix, TQMimeSourceFactory *msf);
+extern TQString htmlVoltageFrequencyGraphs(const Device::Data &data, const TQString &imagePrefix, TQMimeSourceFactory *msf);
 
 class MemoryGraphData
 {
 public:
   Address startAddress, endAddress;
-  QString start, end, label;
+  TQString start, end, label;
   int height;
   bool operator <(const MemoryGraphData &data) const { return ( startAddress < data.startAddress ); }
 };
-extern QPixmap memoryGraph(const QValueList<MemoryGraphData> &ranges);
+extern TQPixmap memoryGraph(const TQValueList<MemoryGraphData> &ranges);
 
 #endif
 
diff --git a/src/devices/base/generic_device.cpp b/src/devices/base/generic_device.cpp
index bf69dce..bfbd37d 100644
--- a/src/devices/base/generic_device.cpp
+++ b/src/devices/base/generic_device.cpp
@@ -13,7 +13,7 @@
 #include "register.h"
 
 //-----------------------------------------------------------------------------
-const Device::Status::Data Device::Status::DATA[Nb_Types] = {
+const Device::tqStatus::Data Device::tqStatus::DATA[Nb_Types] = {
   { "IP",       I18N_NOOP("In Production")                  },
   { "Future",   I18N_NOOP("Future Product")                 },
   { "NR",       I18N_NOOP("Not Recommended for New Design") },
@@ -52,10 +52,10 @@ const Device::Package::TypeData Device::Package::TYPE_DATA[] = {
   { "tssop", I18N_NOOP("TSSOP"),  Bar,    {  8, 14,  0,  0,  0,  0,  0,  0,   0 } },
   { "soic",  I18N_NOOP("SOIC"),   Bar,    {  8, 14, 18, 20, 28,  0,  0,  0,   0 } },
   { "tqfp",  I18N_NOOP("TQFP"),   Square, {  0,  0,  0,  0,  0, 44, 64, 80, 100 } },
-  { "mqfp",  I18N_NOOP("MQFP"),   Square, {  0,  0,  0,  0,  0, 44,  0,  0,   0 } },
+  { "mqfp",  I18N_NOOP("MTQFP"),   Square, {  0,  0,  0,  0,  0, 44,  0,  0,   0 } },
   { "dfns",  I18N_NOOP("DFN-S"),  Bar,    {  8,  0,  0,  0,  0,  0,  0,  0,   0 } },
-  { "qfn",   I18N_NOOP("QFN"),    Square, {  0, 16,  0, 20, 28, 44,  0,  0,   0 } },
-  { "qfns",  I18N_NOOP("QFN-S"),  Bar,    {  0,  0,  0,  0, 28,  0,  0,  0,   0 } },
+  { "qfn",   I18N_NOOP("TQFN"),    Square, {  0, 16,  0, 20, 28, 44,  0,  0,   0 } },
+  { "qfns",  I18N_NOOP("TQFN-S"),  Bar,    {  0,  0,  0,  0, 28,  0,  0,  0,   0 } },
   { "plcc",  I18N_NOOP("PLCC"),   Square, {  0,  0,  0,  0,  0, 44, 68, 84,   0 } },
   { "mlf",   I18N_NOOP("MLF"),    Square, {  0,  0,  0,  0, 28,  0,  0,  0,   0 } },
   { "dfn",   I18N_NOOP("DFN"),    Bar,    {  8,  0,  0,  0,  0,  0,  0,  0,   0 } },
@@ -145,69 +145,69 @@ double Device::Data::vddMax() const
 }
 
 //-----------------------------------------------------------------------------
-QDataStream &Device::operator <<(QDataStream &s, const RangeBox::Value &rbv)
+TQDataStream &Device::operator <<(TQDataStream &s, const RangeBox::Value &rbv)
 {
   s << rbv.x << rbv.yMin << rbv.yMax;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, RangeBox::Value &rbv)
+TQDataStream &Device::operator >>(TQDataStream &s, RangeBox::Value &rbv)
 {
   s >> rbv.x >> rbv.yMin >> rbv.yMax;
   return s;
 }
 
-QDataStream &Device::operator <<(QDataStream &s, const RangeBox &rb)
+TQDataStream &Device::operator <<(TQDataStream &s, const RangeBox &rb)
 {
   s << rb.start << rb.end << rb.osc << rb.mode << rb.special;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, RangeBox &rb)
+TQDataStream &Device::operator >>(TQDataStream &s, RangeBox &rb)
 {
   s >> rb.start >> rb.end >> rb.osc >> rb.mode >> rb.special;
   return s;
 }
 
-QDataStream &Device::operator <<(QDataStream &s, const FrequencyRange &frange)
+TQDataStream &Device::operator <<(TQDataStream &s, const FrequencyRange &frange)
 {
   s << frange.operatingCondition << frange.special << frange.vdds;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, FrequencyRange &frange)
+TQDataStream &Device::operator >>(TQDataStream &s, FrequencyRange &frange)
 {
   s >> frange.operatingCondition >> frange.special >> frange.vdds;
   return s;
 }
 
-QDataStream &Device::operator <<(QDataStream &s, const Package &package)
+TQDataStream &Device::operator <<(TQDataStream &s, const Package &package)
 {
   s << package.types << package.pins;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, Package &package)
+TQDataStream &Device::operator >>(TQDataStream &s, Package &package)
 {
   s >> package.types >> package.pins;
   return s;
 }
 
-QDataStream &Device::operator <<(QDataStream &s, const Documents &documents)
+TQDataStream &Device::operator <<(TQDataStream &s, const Documents &documents)
 {
   s << documents.webpage << documents.datasheet << documents.progsheet << documents.erratas;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, Documents &documents)
+TQDataStream &Device::operator >>(TQDataStream &s, Documents &documents)
 {
   s >> documents.webpage >> documents.datasheet >> documents.progsheet >> documents.erratas;
   return s;
 }
 
-QDataStream &Device::operator <<(QDataStream &s, const Data &data)
+TQDataStream &Device::operator <<(TQDataStream &s, const Data &data)
 {
   s << data._name << data._documents << data._alternatives << data._status
     << data._frequencyRanges << data._memoryTechnology
     << data._packages;
   return s;
 }
-QDataStream &Device::operator >>(QDataStream &s, Data &data)
+TQDataStream &Device::operator >>(TQDataStream &s, Data &data)
 {
   s >> data._name >> data._documents >> data._alternatives >> data._status
     >> data._frequencyRanges >> data._memoryTechnology
diff --git a/src/devices/base/generic_device.h b/src/devices/base/generic_device.h
index e3cbec9..73f9b15 100644
--- a/src/devices/base/generic_device.h
+++ b/src/devices/base/generic_device.h
@@ -9,7 +9,7 @@
 #ifndef GENERIC_DEVICE_H
 #define GENERIC_DEVICE_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include "common/common/misc.h"
 #include "common/common/bitvalue.h"
@@ -19,9 +19,9 @@
 namespace Device
 {
 //----------------------------------------------------------------------------
-BEGIN_DECLARE_ENUM(Status)
+BEGIN_DECLARE_ENUM(tqStatus)
   InProduction = 0, Future, NotRecommended, EOL, Unknown, Mature
-END_DECLARE_ENUM_STD(Status)
+END_DECLARE_ENUM_STD(tqStatus)
 
 BEGIN_DECLARE_ENUM(MemoryTechnology)
   Flash = 0, Eprom, Rom, Romless
@@ -31,7 +31,7 @@ class RangeBox {
 public:
   struct Value { double x, yMin, yMax; };
   Value start, end;
-  QString osc, mode, special;
+  TQString osc, mode, special;
   double yMin() const { return qMin(start.yMin, end.yMin); }
   double yMax() const { return qMax(start.yMax, end.yMax); }
 };
@@ -48,7 +48,7 @@ class FrequencyRange {
 public:
   OperatingCondition operatingCondition;
   Special special;
-  QValueVector<RangeBox> vdds;
+  TQValueVector<RangeBox> vdds;
   double vddMin() const;
   double vddMax() const;
 };
@@ -62,15 +62,15 @@ public:
 class Package
 {
 public:
-  QValueVector<uint> types;
-  QValueVector<QString> pins;
+  TQValueVector<uint> types;
+  TQValueVector<TQString> pins;
 
 public:
   enum Shape { Bar, Square };
   enum { MAX_NB = 9 };
   struct TypeData {
     const char *name, *label;
-    Shape shape;
+    Shape tqshape;
     uint nbPins[MAX_NB];
   };
   static const TypeData TYPE_DATA[];
@@ -79,8 +79,8 @@ public:
 class Documents
 {
 public:
-  QString webpage, datasheet, progsheet;
-  QStringList erratas;
+  TQString webpage, datasheet, progsheet;
+  TQStringList erratas;
 };
 
 //----------------------------------------------------------------------------
@@ -108,7 +108,7 @@ public:
   bool operator !=(const Array &array) const { return _data!=array._data; }
 
 private:
-  QMemArray<BitValue> _data;
+  TQMemArray<BitValue> _data;
 };
 
 //----------------------------------------------------------------------------
@@ -118,15 +118,15 @@ public:
   Data(RegistersData *rdata) : _group(0), _registersData(rdata) {}
   virtual ~Data();
   const GroupBase &group() const { return *_group; }
-  virtual QString name() const { return _name; }
-  virtual QString fname(Special) const { return _name; }
-  virtual QString listViewGroup() const = 0;
-  Status status() const { return _status; }
+  virtual TQString name() const { return _name; }
+  virtual TQString fname(Special) const { return _name; }
+  virtual TQString listViewGroup() const = 0;
+  tqStatus status() const { return _status; }
   const Documents &documents() const { return _documents; }
-  const QStringList &alternatives() const { return _alternatives; }
+  const TQStringList &alternatives() const { return _alternatives; }
   MemoryTechnology memoryTechnology() const { return _memoryTechnology; }
   virtual bool matchId(BitValue rawId, IdData &idata) const = 0;
-  const QValueVector<FrequencyRange> &frequencyRanges() const { return _frequencyRanges; }
+  const TQValueVector<FrequencyRange> &frequencyRanges() const { return _frequencyRanges; }
   double vddMin() const;
   double vddMax() const;
   virtual uint nbBitsAddress() const = 0;
@@ -134,37 +134,37 @@ public:
   uint nbCharsAddress() const { return nbBitsAddress()/4 + (nbBitsAddress()%4 ? 1 : 0); }
   virtual bool canWriteCalibration() const = 0; // #### REMOVE ME
   const RegistersData *registersData() const { return _registersData; }
-  const QValueVector<Package> &packages() const { return _packages; }
+  const TQValueVector<Package> &packages() const { return _packages; }
 
 protected:
   const GroupBase *_group;
-  QString _name;
+  TQString _name;
   Documents _documents;
-  QStringList _alternatives;
-  Status _status;
-  QValueVector<FrequencyRange> _frequencyRanges;
+  TQStringList _alternatives;
+  tqStatus _status;
+  TQValueVector<FrequencyRange> _frequencyRanges;
   MemoryTechnology _memoryTechnology;
   RegistersData *_registersData;
-  QValueVector<Package> _packages;
+  TQValueVector<Package> _packages;
 
   friend class XmlToDataBase;
   friend class GroupBase;
-  friend QDataStream &operator <<(QDataStream &s, const Data &data);
-  friend QDataStream &operator >>(QDataStream &s, Data &data);
+  friend TQDataStream &operator <<(TQDataStream &s, const Data &data);
+  friend TQDataStream &operator >>(TQDataStream &s, Data &data);
 };
 
-QDataStream &operator <<(QDataStream &s, const RangeBox::Value &rbv);
-QDataStream &operator >>(QDataStream &s, RangeBox::Value &rbv);
-QDataStream &operator <<(QDataStream &s, const RangeBox &rb);
-QDataStream &operator >>(QDataStream &s, RangeBox &rb);
-QDataStream &operator <<(QDataStream &s, const FrequencyRange &frange);
-QDataStream &operator >>(QDataStream &s, FrequencyRange &frange);
-QDataStream &operator <<(QDataStream &s, const Package &package);
-QDataStream &operator >>(QDataStream &s, Package &package);
-QDataStream &operator <<(QDataStream &s, const Documents &documents);
-QDataStream &operator >>(QDataStream &s, Documents &documents);
-QDataStream &operator <<(QDataStream &s, const Data &data);
-QDataStream &operator >>(QDataStream &s, Data &data);
+TQDataStream &operator <<(TQDataStream &s, const RangeBox::Value &rbv);
+TQDataStream &operator >>(TQDataStream &s, RangeBox::Value &rbv);
+TQDataStream &operator <<(TQDataStream &s, const RangeBox &rb);
+TQDataStream &operator >>(TQDataStream &s, RangeBox &rb);
+TQDataStream &operator <<(TQDataStream &s, const FrequencyRange &frange);
+TQDataStream &operator >>(TQDataStream &s, FrequencyRange &frange);
+TQDataStream &operator <<(TQDataStream &s, const Package &package);
+TQDataStream &operator >>(TQDataStream &s, Package &package);
+TQDataStream &operator <<(TQDataStream &s, const Documents &documents);
+TQDataStream &operator >>(TQDataStream &s, Documents &documents);
+TQDataStream &operator <<(TQDataStream &s, const Data &data);
+TQDataStream &operator >>(TQDataStream &s, Data &data);
 
 } // namespace
 
diff --git a/src/devices/base/generic_memory.cpp b/src/devices/base/generic_memory.cpp
index 78c4dd6..54190f5 100644
--- a/src/devices/base/generic_memory.cpp
+++ b/src/devices/base/generic_memory.cpp
@@ -8,8 +8,8 @@
  ***************************************************************************/
 #include "generic_memory.h"
 
-bool Device::Memory::load(QTextStream &stream, QStringList &errors,
-			  WarningTypes &warningTypes, QStringList &warnings)
+bool Device::Memory::load(TQTextStream &stream, TQStringList &errors,
+			  WarningTypes &warningTypes, TQStringList &warnings)
 {
   HexBuffer hb;
   if ( !hb.load(stream, errors) ) return false;
@@ -17,12 +17,12 @@ bool Device::Memory::load(QTextStream &stream, QStringList &errors,
   return true;
 }
 
-Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, QStringList &warnings)
+Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, TQStringList &warnings)
 {
   clear();
   WarningTypes result = NoWarning;
   warnings.clear();
-  QMap<uint, bool> inRange;
+  TQMap<uint, bool> inRange;
   fromHexBuffer(hb, result, warnings, inRange);
 
    // check that all values in FragBuffer are within memory ranges
@@ -31,7 +31,7 @@ Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb,
     if ( !it.data().isInitialized() || inRange[it.key()] ) continue;
     if ( !(result & ValueOutsideRange) ) {
       result |= ValueOutsideRange;
-      warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").arg(toHexLabel(it.key(), 8));
+      warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").tqarg(toHexLabel(it.key(), 8));
     }
     break;
   }
@@ -39,7 +39,7 @@ Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb,
   return result;
 }
 
-bool Device::Memory::save(QTextStream &stream, HexBuffer::Format format) const
+bool Device::Memory::save(TQTextStream &stream, HexBuffer::Format format) const
 {
   savePartial(stream, format);
   HexBuffer hb;
diff --git a/src/devices/base/generic_memory.h b/src/devices/base/generic_memory.h
index 74bd938..f7127b5 100644
--- a/src/devices/base/generic_memory.h
+++ b/src/devices/base/generic_memory.h
@@ -26,21 +26,21 @@ public:
   virtual BitValue checksum() const = 0;
 
   virtual HexBuffer toHexBuffer() const = 0;
-  bool save(QTextStream &stream, HexBuffer::Format format) const;
+  bool save(TQTextStream &stream, HexBuffer::Format format) const;
   enum WarningType { NoWarning = 0, ValueTooLarge = 1, ValueOutsideRange = 2 };
-  Q_DECLARE_FLAGS(WarningTypes, WarningType)
-  WarningTypes fromHexBuffer(const HexBuffer &hb, QStringList &warnings);
-  bool load(QTextStream &stream, QStringList &errors, WarningTypes &warningTypes, QStringList &warnings);
+  TQ_DECLARE_FLAGS(WarningTypes, WarningType)
+  WarningTypes fromHexBuffer(const HexBuffer &hb, TQStringList &warnings);
+  bool load(TQTextStream &stream, TQStringList &errors, WarningTypes &warningTypes, TQStringList &warnings);
 
 protected:
   const Data &_device;
 
   Memory(const Data &device) : _device(device) {}
   virtual void fromHexBuffer(const HexBuffer &hb, WarningTypes &warningTypes,
-                             QStringList &warnings, QMap<uint, bool> &inRange) = 0;
-  virtual void savePartial(QTextStream &stream, HexBuffer::Format format) const = 0;
+                             TQStringList &warnings, TQMap<uint, bool> &inRange) = 0;
+  virtual void savePartial(TQTextStream &stream, HexBuffer::Format format) const = 0;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(Memory::WarningTypes)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(Memory::WarningTypes)
 
 } // namespace
 
diff --git a/src/devices/base/hex_buffer.cpp b/src/devices/base/hex_buffer.cpp
index a63554d..09bf847 100644
--- a/src/devices/base/hex_buffer.cpp
+++ b/src/devices/base/hex_buffer.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "hex_buffer.h"
 
-#include <qtextstream.h>
+#include <tqtextstream.h>
 
 #include "devices/base/generic_device.h"
 
@@ -18,7 +18,7 @@ const char * const HexBuffer::FORMATS[Nb_Formats] = {
   "inhx8m", /*"inhx8s", */"inhx16", "inhx32"
 };
 
-void HexBuffer::savePartial(QTextStream &stream, Format format) const
+void HexBuffer::savePartial(TQTextStream &stream, Format format) const
 {
   BitValue oldseg;
   const_iterator block = begin();
@@ -37,7 +37,7 @@ void HexBuffer::savePartial(QTextStream &stream, Format format) const
   }
 }
 
-void HexBuffer::saveEnd(QTextStream &stream) const
+void HexBuffer::saveEnd(TQTextStream &stream) const
 {
   stream << ":00000001FF\n";
 }
@@ -46,7 +46,7 @@ void HexBuffer::saveEnd(QTextStream &stream) const
  * Original code source from Timo Rossi,
  * modified by Alain Gibaud to support large blocks write
  */
-void HexBuffer::writeHexBlock(QTextStream &stream, int reclen, // length (in words)
+void HexBuffer::writeHexBlock(TQTextStream &stream, int reclen, // length (in words)
 			  const_iterator& data, // pointer to 1st data word (incremented by function)
                           Format format)
 {
@@ -133,33 +133,33 @@ bool HexBuffer::fetchNextBlock(const_iterator& it, const const_iterator &end, in
     return *len != 0  ;
 }
 
-QString HexBuffer::ErrorData::message() const
+TQString HexBuffer::ErrorData::message() const
 {
   switch (type) {
-    case UnrecognizedFormat: return i18n("Unrecognized format (line %1).").arg(line);
+    case UnrecognizedFormat: return i18n("Unrecognized format (line %1).").tqarg(line);
     case UnexpectedEOF: return i18n("Unexpected end-of-file.");
-    case UnexpectedEOL: return i18n("Unexpected end-of-line (line %1).").arg(line);
-    case WrongCRC: return i18n("CRC mismatch (line %1).").arg(line);
+    case UnexpectedEOL: return i18n("Unexpected end-of-line (line %1).").tqarg(line);
+    case WrongCRC: return i18n("CRC mismatch (line %1).").tqarg(line);
   }
   Q_ASSERT(false);
-  return QString::null;
+  return TQString();
 }
 
-bool HexBuffer::load(QTextStream &stream, QStringList &errors)
+bool HexBuffer::load(TQTextStream &stream, TQStringList &errors)
 {
   Format format;
-  QValueList<ErrorData> list = load(stream, format);
+  TQValueList<ErrorData> list = load(stream, format);
   if ( list.isEmpty() ) return true;
   errors.clear();
   for (uint i=0; i<uint(list.count()); i++) errors += list[i].message();
   return false;
 }
 
-QValueList<HexBuffer::ErrorData> HexBuffer::load(QTextStream &stream, Format &format)
+TQValueList<HexBuffer::ErrorData> HexBuffer::load(TQTextStream &stream, Format &format)
 {
   clear();
   format = Nb_Formats;
-  QValueList<HexBuffer::ErrorData> errors;
+  TQValueList<HexBuffer::ErrorData> errors;
   load(stream, format, errors);
   if ( format==Nb_Formats ) format = IHX8M; // default
   return errors;
@@ -170,13 +170,13 @@ QValueList<HexBuffer::ErrorData> HexBuffer::load(QTextStream &stream, Format &fo
    the format automagicly by the wordcount and length of the line
    Tested in 8 and 16 bits modes
    ------------------------------------------------------------------------ */
-void HexBuffer::load(QTextStream &stream, Format &format, QValueList<ErrorData> &errors)
+void HexBuffer::load(TQTextStream &stream, Format &format, TQValueList<ErrorData> &errors)
 {
     uint addrH = 0; // upper 16 bits of 32 bits address (inhx32 format)
     uint line = 1;
 
     for (; !stream.atEnd(); line++) { // read each line
-        QString s = stream.readLine();
+        TQString s = stream.readLine();
         if ( !s.startsWith(":") ) continue; // skip invalid intel hex line
         s = s.stripWhiteSpace(); // clean-up white spaces at end-of-line
         if ( s==":" ) continue; // skip empty line
@@ -250,8 +250,8 @@ void HexBuffer::load(QTextStream &stream, Format &format, QValueList<ErrorData>
               // however, I  don't know if such a situation can occurs
               uint a = addrbase+x >> 1;
               BitValue value = (*this)[a];
-              if ( addrbase+x & 1 ) insert(a, value.maskWith(0x00FF) | data << 8); // Odd addr => Hi byte
-              else insert(a, value.maskWith(0xFF00) | data); // Low byte
+              if ( addrbase+x & 1 ) insert(a, value.tqmaskWith(0x00FF) | data << 8); // Odd addr => Hi byte
+              else insert(a, value.tqmaskWith(0xFF00) | data); // Low byte
               //if ( x==0 ) qDebug("fb@%s: %s", toHex(addrbase+x >> 1, 8).data(), toHex(fb[addrbase+x >> 1], 8).data());
               cksum += data;
             }
diff --git a/src/devices/base/hex_buffer.h b/src/devices/base/hex_buffer.h
index 93b0640..fcbf1c5 100644
--- a/src/devices/base/hex_buffer.h
+++ b/src/devices/base/hex_buffer.h
@@ -12,9 +12,9 @@
 
 #include "common/global/global.h"
 #include "common/common/bitvalue.h"
-class QTextStream;
+class TQTextStream;
 
-class HexBuffer : public QMap<uint, BitValue>
+class HexBuffer : public TQMap<uint, BitValue>
 {
 public:
   enum Format { /// Differents flavors of Intel HEX file formats
@@ -26,26 +26,26 @@ public:
   };
   static const char * const FORMATS[Nb_Formats];
 
-  void savePartial(QTextStream &s, Format format) const;
-  void saveEnd(QTextStream &s) const;
+  void savePartial(TQTextStream &s, Format format) const;
+  void saveEnd(TQTextStream &s) const;
   enum ErrorType { UnrecognizedFormat, WrongCRC, UnexpectedEOF, UnexpectedEOL };
   class ErrorData {
   public:
     ErrorData() {}
     ErrorData(uint _line, ErrorType _type) : line(_line), type(_type) {}
-    QString message() const;
+    TQString message() const;
     uint line;
     ErrorType type;
   };
-  QValueList<ErrorData> load(QTextStream &stream, Format &format);
-  bool load(QTextStream &stream, QStringList &errors);
+  TQValueList<ErrorData> load(TQTextStream &stream, Format &format);
+  bool load(TQTextStream &stream, TQStringList &errors);
 
 private:
   enum { HEXBLKSIZE = 8 }; // line size in HEX files
 
   static bool fetchNextBlock(const_iterator& start, const const_iterator &end, int *len);
-  static void writeHexBlock(QTextStream &stream, int reclen, const_iterator& data, Format format);
-  void load(QTextStream &stream, Format &format, QValueList<ErrorData> &errors);
+  static void writeHexBlock(TQTextStream &stream, int reclen, const_iterator& data, Format format);
+  void load(TQTextStream &stream, Format &format, TQValueList<ErrorData> &errors);
 };
 
 #endif
diff --git a/src/devices/base/register.cpp b/src/devices/base/register.cpp
index 85fc013..dcd4c18 100644
--- a/src/devices/base/register.cpp
+++ b/src/devices/base/register.cpp
@@ -25,12 +25,12 @@ Register::TypeData::TypeData(Address address, uint nbChars)
 {
   Q_ASSERT( address.isValid() && nbChars!=0 );
 }
-Register::TypeData::TypeData(const QString &name, uint nbChars)
+Register::TypeData::TypeData(const TQString &name, uint nbChars)
   : _nbChars(nbChars), _name(name)
 {
   Q_ASSERT( !name.isEmpty() && nbChars!=0 );
 }
-Register::TypeData::TypeData(const QString &name, Address address, uint nbChars)
+Register::TypeData::TypeData(const TQString &name, Address address, uint nbChars)
   : _nbChars(nbChars), _address(address), _name(name)
 {
   Q_ASSERT( address.isValid() && nbChars!=0 && !name.isEmpty() );
@@ -46,21 +46,21 @@ Register::Type Register::TypeData::type() const
   return Combined;
 }
 
-QString Register::TypeData::toString() const
+TQString Register::TypeData::toString() const
 {
-  return QString("%1 %2 %3").arg(toLabel(_address)).arg(_nbChars).arg(_name);
+  return TQString("%1 %2 %3").tqarg(toLabel(_address)).tqarg(_nbChars).tqarg(_name);
 }
 
-Register::TypeData Register::TypeData::fromString(const QString &s)
+Register::TypeData Register::TypeData::fromString(const TQString &s)
 {
-  QStringList list = QStringList::split(" ", s);
+  TQStringList list = TQStringList::split(" ", s);
   if ( list.count()<2 || list.count()>3 ) return TypeData();
   bool ok;
   Address address = list[0].toUInt(&ok);
   if ( !ok ) return TypeData();
   uint nbChars = list[1].toUInt(&ok);
   if ( !ok || nbChars==0 || (nbChars%2)!=0 ) return TypeData();
-  QString name;
+  TQString name;
   if ( list.count()==3 ) name = list[2];
   if ( !address.isValid() ) {
     if ( name.isEmpty() ) return TypeData();
@@ -83,7 +83,7 @@ void Register::List::init()
 void Register::List::setWatched(const TypeData &data, bool watched)
 {
   if (watched) {
-    if ( _watched.contains(data) ) return;
+    if ( _watched.tqcontains(data) ) return;
     _watched.append(data);
   } else _watched.remove(data);
   delayedChanged();
@@ -112,7 +112,7 @@ void Register::List::setValue(const TypeData &data, BitValue value)
   delayedChanged();
 }
 
-void Register::List::setPortData(uint index, const QMap<uint, Device::PortBitData> &data)
+void Register::List::setPortData(uint index, const TQMap<uint, Device::PortBitData> &data)
 {
   _portDatas[index].old = _portDatas[index].current;
   _portDatas[index].current = data;
@@ -122,7 +122,7 @@ void Register::List::setPortData(uint index, const QMap<uint, Device::PortBitDat
 BitValue Register::List::value(const TypeData &data) const
 {
   if ( !data.address().isValid() ) {
-    if ( !_specials.contains(data.name()) ) return BitValue();
+    if ( !_specials.tqcontains(data.name()) ) return BitValue();
     return _specials[data.name()].current;
   }
   Q_ASSERT( (data.nbChars()%2)==0 );
@@ -140,7 +140,7 @@ BitValue Register::List::value(const TypeData &data) const
 BitValue Register::List::oldValue(const TypeData &data) const
 {
   if ( !data.address().isValid() ) {
-    if ( !_specials.contains(data.name()) ) return BitValue();
+    if ( !_specials.tqcontains(data.name()) ) return BitValue();
     return _specials[data.name()].old;
   }
   Q_ASSERT( (data.nbChars()%2)==0 );
diff --git a/src/devices/base/register.h b/src/devices/base/register.h
index 1c587e2..5e89f91 100644
--- a/src/devices/base/register.h
+++ b/src/devices/base/register.h
@@ -16,8 +16,8 @@ namespace Register { class TypeData; }
 namespace Device
 {
 enum RegisterProperty { NotAccessible = 0x0, Readable = 0x1, Writable = 0x2 };
-Q_DECLARE_FLAGS(RegisterProperties, RegisterProperty)
-Q_DECLARE_OPERATORS_FOR_FLAGS(RegisterProperties)
+TQ_DECLARE_FLAGS(RegisterProperties, RegisterProperty)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(RegisterProperties)
 
 enum { MAX_NB_PORTS = 8 };
 enum { MAX_NB_PORT_BITS = 16 };
@@ -44,20 +44,20 @@ class TypeData {
 public:
   TypeData() : _nbChars(0) {}
   TypeData(Address address, uint nbChars);
-  TypeData(const QString &name, uint nbChars);
-  TypeData(const QString &name, Address address, uint nbChars);
+  TypeData(const TQString &name, uint nbChars);
+  TypeData(const TQString &name, Address address, uint nbChars);
   bool operator ==(const TypeData &data) const { return _name==data._name && _address==data._address && _nbChars==data._nbChars; }
   Type type() const;
-  QString name() const { return _name; }
+  TQString name() const { return _name; }
   Address address() const { return _address; }
   uint nbChars() const { return _nbChars; }
-  QString toString() const;
-  static TypeData fromString(const QString &s);
+  TQString toString() const;
+  static TypeData fromString(const TQString &s);
 
 private:
   uint    _nbChars;
   Address _address;
-  QString _name;
+  TQString _name;
 };
 
 } // namespace
@@ -77,12 +77,12 @@ public:
   virtual uint addressFromIndex(uint i) const = 0;
   virtual uint indexFromAddress(Address address) const = 0;
   virtual RegisterProperties properties(Address address) const = 0;
-  virtual QValueList<Register::TypeData> relatedRegisters(const Register::TypeData &data) const = 0;
+  virtual TQValueList<Register::TypeData> relatedRegisters(const Register::TypeData &data) const = 0;
   virtual bool hasPort(uint index) const = 0;
   virtual int portIndex(Address address) const = 0;
-  virtual QString portName(uint index) const = 0;
+  virtual TQString portName(uint index) const = 0;
   virtual bool hasPortBit(uint index, uint bit) const = 0;
-  virtual QString portBitName(uint index, uint bit) const = 0;
+  virtual TQString portBitName(uint index, uint bit) const = 0;
 };
 
 } // namespace
@@ -96,33 +96,34 @@ extern List &list();
 class List : public GenericStorage
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   List() : GenericStorage(0, "register_list") {}
   void init();
   void setWatched(const TypeData &data, bool watched);
   void clearWatched();
-  const QValueList<TypeData> &watched() const { return _watched; }
-  bool isWatched(const TypeData &data) const { return _watched.contains(data); }
+  const TQValueList<TypeData> &watched() const { return _watched; }
+  bool isWatched(const TypeData &data) const { return _watched.tqcontains(data); }
   void setValue(const TypeData &data, BitValue value);
   BitValue value(const TypeData &data) const;
   BitValue oldValue(const TypeData &data) const;
-  void setPortData(uint index, const QMap<uint, Device::PortBitData> &data);
-  QMap<uint, Device::PortBitData> portData(uint index) const { return _portDatas[index].current; }
-  QMap<uint, Device::PortBitData> oldPortData(uint index) const { return _portDatas[index].old; }
+  void setPortData(uint index, const TQMap<uint, Device::PortBitData> &data);
+  TQMap<uint, Device::PortBitData> portData(uint index) const { return _portDatas[index].current; }
+  TQMap<uint, Device::PortBitData> oldPortData(uint index) const { return _portDatas[index].old; }
 
 private:
   class StateData {
   public:
     BitValue current, old;
   };
-  QMap<Address, StateData> _regulars; // registers with address
-  QMap<QString, StateData> _specials; // registers with no address
+  TQMap<Address, StateData> _regulars; // registers with address
+  TQMap<TQString, StateData> _specials; // registers with no address
   class PortData {
   public:
-    QMap<uint, Device::PortBitData> current, old;
+    TQMap<uint, Device::PortBitData> current, old;
   };
-  QMap<uint, PortData> _portDatas; // port index
-  QValueList<TypeData> _watched;
+  TQMap<uint, PortData> _portDatas; // port index
+  TQValueList<TypeData> _watched;
 };
 
 } // namespace
diff --git a/src/devices/gui/device_group_ui.h b/src/devices/gui/device_group_ui.h
index 3b2fa91..d123d7d 100644
--- a/src/devices/gui/device_group_ui.h
+++ b/src/devices/gui/device_group_ui.h
@@ -9,8 +9,8 @@
 #ifndef DEVICE_GROUP_UI_H
 #define DEVICE_GROUP_UI_H
 
-#include <qpixmap.h>
-class QWidget;
+#include <tqpixmap.h>
+class TQWidget;
 class KPopupMenu;
 class KListViewItem;
 class KAction;
@@ -31,11 +31,11 @@ class MemoryEditor;
 class GroupUI : public ::Group::BaseGui
 {
 public:
-  virtual HexView *createHexView(const HexEditor &editor, QWidget *parent) const = 0;
-  virtual Register::View *createRegisterView(QWidget *parent) const = 0;
-  virtual MemoryEditor *createConfigEditor(Device::Memory &memory, QWidget *parent) const = 0;
-  virtual void fillWatchListContainer(ListContainer *container, QValueVector<Register::TypeData> &ids) const = 0;
-  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const = 0;
+  virtual HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const = 0;
+  virtual Register::View *createRegisterView(TQWidget *tqparent) const = 0;
+  virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const = 0;
+  virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const = 0;
+  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const = 0;
 };
 
 inline const Device::GroupUI &groupui(const Device::Data &data) { return static_cast<const Device::GroupUI &>(*data.group().gui()); }
diff --git a/src/devices/gui/hex_view.cpp b/src/devices/gui/hex_view.cpp
index 6b26b0a..ac82ddf 100644
--- a/src/devices/gui/hex_view.cpp
+++ b/src/devices/gui/hex_view.cpp
@@ -9,8 +9,8 @@
  ***************************************************************************/
 #include "hex_view.h"
 
-Device::HexView::HexView(const HexEditor &editor, QWidget *parent, const char *name)
-  : MemoryEditorGroup(0, parent, name), _editor(editor)
+Device::HexView::HexView(const HexEditor &editor, TQWidget *tqparent, const char *name)
+  : MemoryEditorGroup(0, tqparent, name), _editor(editor)
 {}
 
 void Device::HexView::display(Memory *memory)
diff --git a/src/devices/gui/hex_view.h b/src/devices/gui/hex_view.h
index d73710e..f1b953b 100644
--- a/src/devices/gui/hex_view.h
+++ b/src/devices/gui/hex_view.h
@@ -19,8 +19,9 @@ namespace Device
 class HexView : public MemoryEditorGroup
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexView(const HexEditor &editor, QWidget *parent, const char *name);
+  HexView(const HexEditor &editor, TQWidget *tqparent, const char *name);
   virtual void display(Memory *memory);
   virtual uint nbChecksumChars() const = 0;
   virtual BitValue checksum() const = 0;
diff --git a/src/devices/gui/hex_word_editor.cpp b/src/devices/gui/hex_word_editor.cpp
index fd64e13..5e8ab7a 100644
--- a/src/devices/gui/hex_word_editor.cpp
+++ b/src/devices/gui/hex_word_editor.cpp
@@ -9,15 +9,15 @@
  ***************************************************************************/
 #include "hex_word_editor.h"
 
-#include <qframe.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqframe.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
 
 //-----------------------------------------------------------------------------
-Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, QWidget *parent)
-  : GenericHexWordEditor(nbChars, true, parent), _memory(memory)
+Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent)
+  : GenericHexWordEditor(nbChars, true, tqparent), _memory(memory)
 {
   setOffset(-1);
 }
@@ -29,8 +29,8 @@ void Device::HexWordEditor::setOffset(int offset)
 }
 
 //-----------------------------------------------------------------------------
-Device::RegisterHexWordEditor::RegisterHexWordEditor(QWidget *parent, uint nbChars, BitValue mask)
-  : GenericHexWordEditor(nbChars, true, parent), _mask(mask)
+Device::RegisterHexWordEditor::RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask)
+  : GenericHexWordEditor(nbChars, true, tqparent), _tqmask(tqmask)
 {
   clear();
 }
diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h
index bd9fadb..db9374c 100644
--- a/src/devices/gui/hex_word_editor.h
+++ b/src/devices/gui/hex_word_editor.h
@@ -19,8 +19,9 @@ namespace Device
 class HexWordEditor : public GenericHexWordEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexWordEditor(Memory &memory, uint nbChars, QWidget *parent);
+  HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent);
   void setOffset(int offset);
   int offset() const { return _offset; }
 
@@ -29,7 +30,7 @@ protected:
   int _offset;
 
   virtual bool isValid() const { return _offset!=-1; }
-  virtual BitValue mask() const = 0;
+  virtual BitValue tqmask() const = 0;
   virtual BitValue normalizeWord(BitValue value) const = 0;
   virtual BitValue word() const = 0;
   virtual void setWord(BitValue value) = 0;
@@ -40,20 +41,21 @@ protected:
 class RegisterHexWordEditor : public GenericHexWordEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  RegisterHexWordEditor(QWidget *parent, uint nbChars, BitValue mask);
+  RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask);
   void clear() { setValue(BitValue()); }
   void setValue(BitValue word);
   BitValue value() const { return _word; }
-  void setColor(QColor color) { setPaletteForegroundColor(color); }
+  void setColor(TQColor color) { setPaletteForegroundColor(color); }
   void unsetColor() { unsetPalette(); }
 
 private:
-  BitValue _mask, _word;
+  BitValue _tqmask, _word;
 
   virtual bool isValid() const { return true; }
-  virtual BitValue mask() const { return _mask; }
-  virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_mask); }
+  virtual BitValue tqmask() const { return _tqmask; }
+  virtual BitValue normalizeWord(BitValue value) const { return value.tqmaskWith(_tqmask); }
   virtual BitValue word() const { return _word; }
   virtual void setWord(BitValue value) { _word = value; }
   virtual BitValue blankValue() const { return BitValue(); }
diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index 175f011..4504e6b 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -9,12 +9,12 @@
  ***************************************************************************/
 #include "memory_editor.h"
 
-#include <qlabel.h>
-#include <qscrollbar.h>
-#include <qlayout.h>
-#include <qgrid.h>
-#include <qtimer.h>
-#include <qpopupmenu.h>
+#include <tqlabel.h>
+#include <tqscrollbar.h>
+#include <tqlayout.h>
+#include <tqgrid.h>
+#include <tqtimer.h>
+#include <tqpopupmenu.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kaction.h>
@@ -28,17 +28,17 @@
 #include "libgui/gui_prog_manager.h"
 
 //-----------------------------------------------------------------------------
-Device::MemoryEditor::MemoryEditor(Device::Memory *memory, QWidget *parent, const char *name)
-  : QFrame(parent, name), _memory(memory)
+Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name)
+  : TQFrame(tqparent, name), _memory(memory)
 {
-  _top = new QVBoxLayout(this, 5, 10);
+  _top = new TQVBoxLayout(this, 5, 10);
 }
 
 //-----------------------------------------------------------------------------
 Device::MemoryRangeEditor::MemoryRangeEditor(Device::Memory &memory,
                     uint nbLines, uint nbCols, uint offset, int nb,
-                    QWidget *parent, const char *name)
-  : MemoryEditor(&memory, parent, name),
+                    TQWidget *tqparent, const char *name)
+  : MemoryEditor(&memory, tqparent, name),
     _nbLines(nbLines), _nbCols(nbCols), _offset(offset), _nb(nb)
 {}
 
@@ -48,60 +48,60 @@ void Device::MemoryRangeEditor::init()
   uint totalNbLines = _nb / _nbCols;
   if ( (_nb % _nbCols)!=0 ) totalNbLines++;
 
-  QHBoxLayout *hbox = new QHBoxLayout(_top);
+  TQHBoxLayout *hbox = new TQHBoxLayout(_top);
 
-  QVBoxLayout *vbox = new QVBoxLayout(hbox);
-  QFrame *frame = new QFrame(this);
-  frame->setFrameStyle(QFrame::Panel | QFrame::Raised);
+  TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
+  TQFrame *frame = new TQFrame(this);
+  frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   frame->setMargin(5);
   vbox->addWidget(frame);
   vbox->addStretch(1);
-  QHBoxLayout *fbox = new QHBoxLayout(frame, 5, 5);
-  QGrid *grid = new QGrid(3+_nbCols, QGrid::Horizontal, frame, "memory_range_editor_grid");
+  TQHBoxLayout *fbox = new TQHBoxLayout(frame, 5, 5);
+  TQGrid *grid = new TQGrid(3+_nbCols, Qt::Horizontal, frame, "memory_range_editor_grid");
   fbox->addWidget(grid);
   grid->setSpacing(0);
   grid->setMargin(3);
-  QFont f("courier", font().pointSize());
+  TQFont f("courier", font().pointSize());
   grid->setFont(f);
   for (uint k=0; k<_nbLines; ++k) {
     // addresses
-    QWidget *w = new QWidget(grid);
+    TQWidget *w = new TQWidget(grid);
     w->setFixedWidth(10);
     _blocks.append(w);
-    QLabel *label = new QLabel(toHex(0, 2*_memory->device().nbBytesAddress()), grid, "address_label");
+    TQLabel *label = new TQLabel(toHex(0, 2*_memory->device().nbBytesAddress()), grid, "address_label");
     _addresses.append(label);
-    label = new QLabel(":", grid);
+    label = new TQLabel(":", grid);
     // memory
     for (uint i = 0; i<_nbCols; ++i) {
       HexWordEditor *h = createHexWordEditor(grid);
       _editors.append(h);
-      connect(h, SIGNAL(modified()), SIGNAL(modified()));
-      connect(h, SIGNAL(moveNext()), SLOT(moveNext()));
-      connect(h, SIGNAL(movePrev()), SLOT(movePrev()));
-      connect(h, SIGNAL(moveFirst()), SLOT(moveFirst()));
-      connect(h, SIGNAL(moveLast()), SLOT(moveLast()));
-      connect(h, SIGNAL(moveUp()), SLOT(moveUp()));
-      connect(h, SIGNAL(moveDown()), SLOT(moveDown()));
-      connect(h, SIGNAL(moveNextPage()), SLOT(moveNextPage()));
-      connect(h, SIGNAL(movePrevPage()), SLOT(movePrevPage()));
+      connect(h, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
+      connect(h, TQT_SIGNAL(moveNext()), TQT_SLOT(moveNext()));
+      connect(h, TQT_SIGNAL(movePrev()), TQT_SLOT(movePrev()));
+      connect(h, TQT_SIGNAL(moveFirst()), TQT_SLOT(moveFirst()));
+      connect(h, TQT_SIGNAL(moveLast()), TQT_SLOT(moveLast()));
+      connect(h, TQT_SIGNAL(moveUp()), TQT_SLOT(moveUp()));
+      connect(h, TQT_SIGNAL(moveDown()), TQT_SLOT(moveDown()));
+      connect(h, TQT_SIGNAL(moveNextPage()), TQT_SLOT(moveNextPage()));
+      connect(h, TQT_SIGNAL(movePrevPage()), TQT_SLOT(movePrevPage()));
     }
   }
 
   //  scrollbar if there are more lines to display than visible
-  _scrollbar = new QScrollBar(0, QMAX(_nbLines, totalNbLines)-_nbLines, 1, _nbLines, 0,
-                              QScrollBar::Vertical, frame, "memory_range_editor_scrollbar");
-  connect(_scrollbar, SIGNAL(valueChanged(int)), SLOT(setIndex(int))) ;
+  _scrollbar = new TQScrollBar(0, TQMAX(_nbLines, totalNbLines)-_nbLines, 1, _nbLines, 0,
+                              Qt::Vertical, frame, "memory_range_editor_scrollbar");
+  connect(_scrollbar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setIndex(int))) ;
   if ( totalNbLines<=_nbLines ) _scrollbar->hide();
   fbox->addWidget(_scrollbar);
   fbox->addStretch(1);
 
   vbox->addStretch(1);
-  QVBoxLayout *vboxc = new QVBoxLayout(hbox);
+  TQVBoxLayout *vboxc = new TQVBoxLayout(hbox);
   vboxc->setSpacing(0);
-  _comment = new QLabel(this);
+  _comment = new TQLabel(this);
   _comment->hide();
   vboxc->addWidget(_comment);
-  _spacer = new QLabel(this);
+  _spacer = new TQLabel(this);
   _spacer->setFixedHeight(10);
   _spacer->hide();
   vboxc->addWidget(_spacer);
@@ -113,7 +113,7 @@ void Device::MemoryRangeEditor::init()
   setIndex(0);
 }
 
-void Device::MemoryRangeEditor::setComment(const QString &text)
+void Device::MemoryRangeEditor::setComment(const TQString &text)
 {
   _comment->setText(text);
   _comment->show();
@@ -167,7 +167,7 @@ void Device::MemoryRangeEditor::setIndex(int index)
 
 void Device::MemoryRangeEditor::moveNext()
 {
-  QValueList<HexWordEditor *>::iterator it = _editors.find((HexWordEditor *)sender());
+  TQValueList<HexWordEditor *>::iterator it = _editors.tqfind((HexWordEditor *)sender());
   ++it;
   if ( it==_editors.end() || (*it)->offset()==-1 ) {
     if ( current()==uint(_scrollbar->maxValue()) ) return; // at end
@@ -178,7 +178,7 @@ void Device::MemoryRangeEditor::moveNext()
 
 void Device::MemoryRangeEditor::movePrev()
 {
-  QValueList<HexWordEditor *>::iterator it = _editors.find((HexWordEditor *)sender());
+  TQValueList<HexWordEditor *>::iterator it = _editors.tqfind((HexWordEditor *)sender());
   if ( it==_editors.begin() ) {
     if ( current()==0 ) return; // at beginning
     setIndex(current()-1);
@@ -209,7 +209,7 @@ void Device::MemoryRangeEditor::moveLast()
 
 void Device::MemoryRangeEditor::moveUp()
 {
-  int i = _editors.findIndex((HexWordEditor *)sender());
+  int i = _editors.tqfindIndex((HexWordEditor *)sender());
   uint line = i / _nbCols;
   if ( line==0 ) {
     if ( current()==0 ) return; // on first line
@@ -220,7 +220,7 @@ void Device::MemoryRangeEditor::moveUp()
 
 void Device::MemoryRangeEditor::moveDown()
 {
-  int i = _editors.findIndex((HexWordEditor *)sender());
+  int i = _editors.tqfindIndex((HexWordEditor *)sender());
   uint line = i / _nbCols;
   if ( line+1==_nbLines ) {
     if ( current()==uint(_scrollbar->maxValue()) ) return; // on last line
@@ -232,7 +232,7 @@ void Device::MemoryRangeEditor::moveDown()
 
 void Device::MemoryRangeEditor::moveNextPage()
 {
-  int i = _editors.findIndex((HexWordEditor *)sender());
+  int i = _editors.tqfindIndex((HexWordEditor *)sender());
   if ( _nbLines>(uint(_scrollbar->maxValue()) - current()) ) i = (_nbLines-1) * _nbCols + (i % _nbCols);
   else setIndex(current()+_nbLines);
   if ( _editors[i]->offset()==-1 ) _editors[i-_nbCols]->setFocus();
@@ -241,20 +241,20 @@ void Device::MemoryRangeEditor::moveNextPage()
 
 void Device::MemoryRangeEditor::movePrevPage()
 {
-  int i = _editors.findIndex((HexWordEditor *)sender());
+  int i = _editors.tqfindIndex((HexWordEditor *)sender());
   if ( current()<_nbLines ) i = (i % _nbCols);
   else setIndex(current()-_nbLines);
   _editors[i]->setFocus();
 }
 
 //-----------------------------------------------------------------------------
-Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, QWidget *parent, const char *name)
-  : MemoryEditor(memory, parent, name)
+Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name)
+  : MemoryEditor(memory, tqparent, name)
 {}
 
 void Device::MemoryEditorGroup::addEditor(MemoryEditor *editor)
 {
-  connect(editor, SIGNAL(modified()), SIGNAL(modified()));
+  connect(editor, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
   _editors.append(editor);
 }
 
@@ -284,8 +284,8 @@ const Device::ActionData Device::ACTION_DATA[Nb_Actions] = {
 };
 
 Device::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Device::Memory &memory,
-                                            QWidget *parent, const char *name)
-  : MemoryEditorGroup(&memory, parent, name),
+                                            TQWidget *tqparent, const char *name)
+  : MemoryEditorGroup(&memory, tqparent, name),
     _title(0), _comment(0), _hexview(hexview)
 {
   for (uint i=0; i<Nb_Actions; i++) _actions[i] = 0;
@@ -294,13 +294,13 @@ Device::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Device::Memor
 void Device::MemoryTypeEditor::init(bool first)
 {
   if ( !first ) _top->addWidget(new SeparatorWidget(this));
-  QHBoxLayout *hbox = new QHBoxLayout(_top);
+  TQHBoxLayout *hbox = new TQHBoxLayout(_top);
 
   _title = new PopupButton(this);
   for (uint i=0; i<Nb_Actions; i++) {
     if ( hasAction(Action(i)) ) {
       _actions[i] = new KAction(i18n(ACTION_DATA[i].label), ACTION_DATA[i].icon, 0,
-                                this, SLOT(doAction()), Main::toplevel().actionCollection());
+                                TQT_TQOBJECT(this), TQT_SLOT(doAction()), Main::toplevel().actionCollection());
       addAction(_actions[i]);
     }
     if ( ACTION_DATA[i].properties & SeparatorAfter ) _title->appendSeparator();
@@ -308,11 +308,11 @@ void Device::MemoryTypeEditor::init(bool first)
   _title->appendSeparator();
   hbox->addWidget(_title);
 
-  _comment = new QLabel(this);
+  _comment = new TQLabel(this);
   hbox->addWidget(_comment);
   hbox->addStretch(1);
 
-  connect(&Main::toplevel(), SIGNAL(stateChanged()), SLOT(stateChanged()));
+  connect(&Main::toplevel(), TQT_SIGNAL(stateChanged()), TQT_SLOT(stateChanged()));
 }
 
 void Device::MemoryTypeEditor::addAction(KAction *action)
diff --git a/src/devices/gui/memory_editor.h b/src/devices/gui/memory_editor.h
index 9836261..2ef60d8 100644
--- a/src/devices/gui/memory_editor.h
+++ b/src/devices/gui/memory_editor.h
@@ -9,14 +9,14 @@
 #ifndef MEMORY_EDITOR_H
 #define MEMORY_EDITOR_H
 
-#include <qframe.h>
-#include <qscrollbar.h>
-#include <qlabel.h>
+#include <tqframe.h>
+#include <tqscrollbar.h>
+#include <tqlabel.h>
 #include "common/common/qflags.h"
 #include "common/common/bitvalue.h"
-class QVBoxLayout;
-class QHBoxLayout;
-class QHBox;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQHBox;
 class KAction;
 class PopupButton;
 
@@ -30,8 +30,8 @@ enum Action { Clear = 0, Zero, ChecksumCheck, Reload,
               Program, Verify, Read, Erase, BlankCheck, Nb_Actions };
 enum ActionProperty { NoProperty = 0, SeparatorAfter = 1, NeedProgrammer = 2,
                       NeedWrite = 4, NeedModified = 8 };
-Q_DECLARE_FLAGS(ActionProperties, ActionProperty)
-Q_DECLARE_OPERATORS_FOR_FLAGS(ActionProperties)
+TQ_DECLARE_FLAGS(ActionProperties, ActionProperty)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(ActionProperties)
 struct ActionData {
   const char *label, *icon;
   ActionProperties properties;
@@ -39,11 +39,12 @@ struct ActionData {
 extern const ActionData ACTION_DATA[Nb_Actions];
 
 //----------------------------------------------------------------------------
-class MemoryEditor : public QFrame
+class MemoryEditor : public TQFrame
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditor(Device::Memory *memory, QWidget *parent, const char *name);
+  MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name);
   virtual void setReadOnly(bool readOnly) = 0;
 
 public slots:
@@ -54,19 +55,20 @@ signals:
 
 protected:
   Device::Memory *_memory;
-  QVBoxLayout    *_top;
+  TQVBoxLayout    *_top;
 };
 
 //----------------------------------------------------------------------------
 class MemoryRangeEditor : public MemoryEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols,
-                    uint offset, int nb, QWidget *parent, const char *name);
+                    uint offset, int nb, TQWidget *tqparent, const char *name);
   virtual void init();
   virtual void setReadOnly(bool readOnly);
-  void setComment(const QString &text);
+  void setComment(const TQString &text);
 
 public slots:
   virtual void updateDisplay();
@@ -87,30 +89,31 @@ protected slots:
 protected:
   uint _nbLines, _nbCols, _offset;
   int  _nb;
-  QValueList<QLabel *> _addresses;
-  QValueList<QWidget *> _blocks;
-  QValueList<HexWordEditor *> _editors;
-  QScrollBar *_scrollbar;
-  QLabel     *_comment;
-  QWidget    *_spacer;
+  TQValueList<TQLabel *> _addresses;
+  TQValueList<TQWidget *> _blocks;
+  TQValueList<HexWordEditor *> _editors;
+  TQScrollBar *_scrollbar;
+  TQLabel     *_comment;
+  TQWidget    *_spacer;
 
   uint wordOffset() const { return _offset + current() * _nbCols; }
   uint current() const { return _scrollbar->value(); }
   virtual uint nbWords() const = 0;
   virtual uint addressIncrement() const = 0;
   virtual Address startAddress() const = 0;
-  virtual HexWordEditor *createHexWordEditor(QWidget *parent) = 0;
+  virtual HexWordEditor *createHexWordEditor(TQWidget *tqparent) = 0;
   virtual bool isRangeReadOnly() const = 0;
   virtual void updateAddressColor(uint i, Address address) { Q_UNUSED(i); Q_UNUSED(address); }
-  virtual void addLegend(QVBoxLayout *vbox) { Q_UNUSED(vbox); }
+  virtual void addLegend(TQVBoxLayout *vbox) { Q_UNUSED(vbox); }
 };
 
 //----------------------------------------------------------------------------
 class MemoryEditorGroup : public MemoryEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditorGroup(Device::Memory *memory, QWidget *parent, const char *name);
+  MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name);
   void addEditor(MemoryEditor *editor);
   virtual void setReadOnly(bool readOnly);
 
@@ -119,15 +122,16 @@ public slots:
 
 protected:
   bool _modified;
-  QValueList<MemoryEditor *> _editors;
+  TQValueList<MemoryEditor *> _editors;
 };
 
 //----------------------------------------------------------------------------
 class MemoryTypeEditor : public MemoryEditorGroup
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, QWidget *parent, const char *name);
+  MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *tqparent, const char *name);
   virtual void init(bool first);
   virtual void setReadOnly(bool readOnly);
 
@@ -137,7 +141,7 @@ protected slots:
 
 protected:
   PopupButton   *_title;
-  QLabel        *_comment;
+  TQLabel        *_comment;
   const HexView *_hexview;
   virtual bool internalDoAction(Action action) = 0; // return true if memory modified
   virtual bool hasAction(Action) const { return true; }
diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp
index 70dedc9..bf49574 100644
--- a/src/devices/gui/register_view.cpp
+++ b/src/devices/gui/register_view.cpp
@@ -12,8 +12,8 @@
 #include "libgui/gui_debug_manager.h"
 
 //----------------------------------------------------------------------------
-Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *parent)
-  : KListViewItem(parent), _index(index), _bit(bit)
+Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *tqparent)
+  : KListViewItem(tqparent), _index(index), _bit(bit)
 {
   const Device::RegistersData *rdata = Main::deviceData()->registersData();
   setText(1, rdata->portBitName(_index, _bit));
@@ -22,8 +22,8 @@ Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListVi
 
 void Register::PortBitListViewItem::updateView()
 {
-  const QMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
-  QString text;
+  const TQMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
+  TQString text;
   if ( pdata.isEmpty() ) text = "--";
   else {
 /*
@@ -43,25 +43,25 @@ void Register::PortBitListViewItem::updateView()
     else text += (pdata[_bit].drivenState==Device::IoHigh ? "1" : "0");
   }
   setText(2, text);
-  repaint();
+  tqrepaint();
 }
 
-void Register::PortBitListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+void Register::PortBitListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
 {
-  QColorGroup ncg = cg;
-  const QMap<uint, Device::PortBitData> &data = Register::list().portData(_index);
-  const QMap<uint, Device::PortBitData> &odata = Register::list().oldPortData(_index);
+  TQColorGroup ncg = cg;
+  const TQMap<uint, Device::PortBitData> &data = Register::list().portData(_index);
+  const TQMap<uint, Device::PortBitData> &odata = Register::list().oldPortData(_index);
   bool changed = ( !data.isEmpty() && data[_bit]!=odata[_bit] );
-  if ( column==2 && changed ) ncg.setColor(QColorGroup::Text, red);
+  if ( column==2 && changed ) ncg.setColor(TQColorGroup::Text, red);
   KListViewItem::paintCell(p, ncg, column, width, align);
 }
 
-QString Register::PortBitListViewItem::tooltip(int col) const
+TQString Register::PortBitListViewItem::tooltip(int col) const
 {
-  if ( col!=2 ) return QString::null;
-  const QMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
-  if ( pdata.isEmpty() ) return QString::null;
-  QString s = text(1) + ": ";
+  if ( col!=2 ) return TQString();
+  const TQMap<uint, Device::PortBitData> &pdata = Register::list().portData(_index);
+  if ( pdata.isEmpty() ) return TQString();
+  TQString s = text(1) + ": ";
   if (pdata[_bit].driving) {
     if ( pdata[_bit].drivingState!=Device::IoUnknown ) s += i18n("unknown state");
     else s += (pdata[_bit].drivingState==Device::IoHigh ? i18n("driving high") : i18n("driving low"));
@@ -75,8 +75,8 @@ QString Register::PortBitListViewItem::tooltip(int col) const
 }
 
 //-----------------------------------------------------------------------------
-Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent)
-  : EditListViewItem(parent), _data(data), _base(NumberBase::Hex)
+Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *tqparent)
+  : EditListViewItem(tqparent), _data(data), _base(NumberBase::Hex)
 {
   setSelectable(false);
   const Device::RegistersData *rdata = Main::deviceData()->registersData();
@@ -92,19 +92,19 @@ Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent
   }
 }
 
-QString Register::ListViewItem::text() const
+TQString Register::ListViewItem::text() const
 {
   BitValue value = Register::list().value(_data);
   uint nbChars = convertNbChars(_data.nbChars(), NumberBase::Hex, _base);
   return (value.isInitialized() ? toLabel(_base, value, nbChars) : "--");
 }
 
-int Register::ListViewItem::compare(QListViewItem *item, int, bool) const
+int Register::ListViewItem::compare(TQListViewItem *item, int, bool) const
 {
   const TypeData &data = static_cast<ListViewItem *>(item)->data();
-  int i1 = list().watched().findIndex(data);
+  int i1 = list().watched().tqfindIndex(data);
   Q_ASSERT( i1!=-1 );
-  int i2 = list().watched().findIndex(_data);
+  int i2 = list().watched().tqfindIndex(_data);
   Q_ASSERT( i2!=-1 );
   return ( i1-i2 );
 }
@@ -114,7 +114,7 @@ void Register::ListViewItem::updateView()
   if ( _data.type()!=Special ) setText(0, toHexLabel(_data.address(), nbCharsAddress()) + ":");
   setText(1, label());
   setText(2, text());
-  repaint();
+  tqrepaint();
   for (uint i=0; i<_items.count(); i++) _items[i]->updateView();
 }
 
@@ -124,38 +124,38 @@ void Register::ListViewItem::setBase(NumberBase base)
   updateView();
 }
 
-void Register::ListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+void Register::ListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
 {
-  QColorGroup ncg = cg;
+  TQColorGroup ncg = cg;
   BitValue value = Register::list().value(_data);
   BitValue oldValue = Register::list().oldValue(_data);
-  if ( column==2 && value!=oldValue ) ncg.setColor(QColorGroup::Text, red);
+  if ( column==2 && value!=oldValue ) ncg.setColor(TQColorGroup::Text, red);
   EditListViewItem::paintCell(p, ncg, column, width, align);
 }
 
-QString Register::ListViewItem::tooltip(int col) const
+TQString Register::ListViewItem::tooltip(int col) const
 {
-  if ( col!=2 ) return QString::null;
+  if ( col!=2 ) return TQString();
   BitValue value = Register::list().value(_data);
-  if ( !value.isInitialized() ) return QString::null;
+  if ( !value.isInitialized() ) return TQString();
   BitValue v = value;
-  QString s;
+  TQString s;
   for (uint i=0; i<_data.nbChars(); i++) {
     char c = v.nybble(i);
     if ( isprint(c) ) s = c + s;
     else s = "." + s;
   }
-  return QString("%1 - %2 - \"%3\"").arg(toHexLabel(value, _data.nbChars()))
-         .arg(toLabel(NumberBase::Bin, value, 4*_data.nbChars())).arg(s);
+  return TQString("%1 - %2 - \"%3\"").tqarg(toHexLabel(value, _data.nbChars()))
+         .tqarg(toLabel(NumberBase::Bin, value, 4*_data.nbChars())).tqarg(s);
 }
 
-QWidget *Register::ListViewItem::editWidgetFactory(int col) const
+TQWidget *Register::ListViewItem::editWidgetFactory(int col) const
 {
   if ( col!=2 || Main::programmerState()!=Programmer::Halted ) return 0;
   return new NumberLineEdit(text(), 0);
 }
 
-void Register::ListViewItem::editDone(int col, const QWidget *edit)
+void Register::ListViewItem::editDone(int col, const TQWidget *edit)
 {
   if ( col!=2 ) return;
   bool ok;
@@ -164,11 +164,11 @@ void Register::ListViewItem::editDone(int col, const QWidget *edit)
 }
 
 //----------------------------------------------------------------------------
-Register::LineEdit::LineEdit(QWidget *parent, const char *name)
-  : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types)
+Register::LineEdit::LineEdit(TQWidget *tqparent, const char *name)
+  : NumberLineEdit(tqparent, name), _base(NumberBase::Nb_Types)
 {
-  connect(this, SIGNAL(lostFocus()), SLOT(updateText()));
-  connect(this, SIGNAL(returnPressed()), SLOT(returnPressedSlot()));
+  connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText()));
+  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot()));
 }
 
 void Register::LineEdit::updateText()
@@ -176,7 +176,7 @@ void Register::LineEdit::updateText()
   setText(_value.isInitialized() ? toLabel(_base, _value, _nbChars) : "--");
   uint w = 2*frameWidth() + maxLabelWidth(_base, _nbChars, font());
   setFixedWidth(w+5);
-  setFixedHeight(minimumSizeHint().height());
+  setFixedHeight(tqminimumSizeHint().height());
 }
 
 void Register::LineEdit::setValue(NumberBase base, BitValue value, uint nbChars)
@@ -196,13 +196,13 @@ void Register::LineEdit::returnPressedSlot()
   emit modified();
 }
 
-void Register::LineEdit::keyPressEvent(QKeyEvent *e)
+void Register::LineEdit::keyPressEvent(TQKeyEvent *e)
 {
   if ( e->key()==Key_Escape ) clearFocus();
   else NumberLineEdit::keyPressEvent(e);
 }
 
 //----------------------------------------------------------------------------
-Register::View::View(QWidget *parent, const char *name)
- : QFrame(parent, name), GenericView(list())
+Register::View::View(TQWidget *tqparent, const char *name)
+ : TQFrame(tqparent, name), GenericView(list())
 {}
diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h
index 7ef8a54..60c8194 100644
--- a/src/devices/gui/register_view.h
+++ b/src/devices/gui/register_view.h
@@ -9,7 +9,7 @@
 #ifndef REGISTER_VIEW_H
 #define REGISTER_VIEW_H
 
-#include <qframe.h>
+#include <tqframe.h>
 
 #include "devices/base/register.h"
 #include "common/gui/number_gui.h"
@@ -23,15 +23,15 @@ enum { PortBitRtti = 1000, RegisterRtti = 1001 };
 class PortBitListViewItem : public KListViewItem
 {
 public:
-  PortBitListViewItem(uint address, uint bit, KListViewItem *parent);
+  PortBitListViewItem(uint address, uint bit, KListViewItem *tqparent);
   virtual int rtti() const { return PortBitRtti; }
   void updateView();
-  QString tooltip(int column) const;
+  TQString tooltip(int column) const;
 
 private:
   uint _index, _bit;
 
-  virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
+  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
 };
 
 //-----------------------------------------------------------------------------
@@ -42,23 +42,23 @@ public:
   virtual int rtti() const { return RegisterRtti; }
   virtual void updateView();
   const TypeData &data() const { return _data; }
-  QString tooltip(int column) const;
+  TQString tooltip(int column) const;
   NumberBase base() const { return _base; }
   void setBase(NumberBase base);
-  virtual QString label() const = 0;
-  virtual int compare(QListViewItem *item, int, bool) const;
+  virtual TQString label() const = 0;
+  virtual int compare(TQListViewItem *item, int, bool) const;
 
 protected:
   TypeData _data;
-  QValueList<PortBitListViewItem *> _items;
+  TQValueList<PortBitListViewItem *> _items;
   NumberBase _base;
 
-  virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
-  virtual QWidget *editWidgetFactory(int col) const;
+  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
+  virtual TQWidget *editWidgetFactory(int col) const;
   virtual bool alwaysAcceptEdit(int) const { return false; }
-  virtual void editDone(int col, const QWidget *editWidget);
+  virtual void editDone(int col, const TQWidget *editWidget);
   virtual uint nbCharsAddress() const = 0;
-  virtual QString text() const;
+  virtual TQString text() const;
   virtual void activate() {}
 };
 
@@ -66,8 +66,9 @@ protected:
 class LineEdit : public NumberLineEdit
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  LineEdit(QWidget *parent, const char *name = 0);
+  LineEdit(TQWidget *tqparent, const char *name = 0);
   void setValue(NumberBase base, BitValue value, uint nbChars);
   BitValue value() const { return _value; }
 
@@ -75,7 +76,7 @@ signals:
   void modified();
 
 protected:
-  virtual void keyPressEvent(QKeyEvent *e);
+  virtual void keyPressEvent(TQKeyEvent *e);
 
 private slots:
   void updateText();
@@ -88,11 +89,12 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class View : public QFrame, public GenericView
+class View : public TQFrame, public GenericView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  View(QWidget *parent, const char *name);
+  View(TQWidget *tqparent, const char *name);
 
 signals:
   void readSignal(uint address);
diff --git a/src/devices/list/device_list.cpp b/src/devices/list/device_list.cpp
index 1434ec8..87ea495 100644
--- a/src/devices/list/device_list.cpp
+++ b/src/devices/list/device_list.cpp
@@ -8,14 +8,14 @@
  ***************************************************************************/
 #include "device_list.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "devices/pic/pic/pic_group.h"
 #include "devices/mem24/mem24/mem24_group.h"
 
 const Device::AutoData Device::AUTO_DATA = { "*", I18N_NOOP("<auto>") };
 
-const Device::Data *Device::Lister::data(const QString &device) const
+const Device::Data *Device::Lister::data(const TQString &device) const
 {
   for (ConstIterator it=begin(); it!=end(); it++) {
     const Data *data = static_cast<const Data *>(it.data()->deviceData(device).data);
@@ -24,7 +24,7 @@ const Device::Data *Device::Lister::data(const QString &device) const
   return 0;
 }
 
-QString Device::Lister::checkName(const QString &device) const
+TQString Device::Lister::checkName(const TQString &device) const
 {
   if ( device==AUTO_DATA.name ) return device;
   if ( isSupported(device) ) return device;
diff --git a/src/devices/list/device_list.h b/src/devices/list/device_list.h
index 3d9fb78..6f00046 100644
--- a/src/devices/list/device_list.h
+++ b/src/devices/list/device_list.h
@@ -24,8 +24,8 @@ class Lister : public ::Group::Lister<GroupBase>
 {
 public:
   Lister();
-  const Data *data(const QString &device) const;
-  QString checkName(const QString &device) const;
+  const Data *data(const TQString &device) const;
+  TQString checkName(const TQString &device) const;
 };
 extern const Lister &lister();
 
diff --git a/src/devices/mem24/base/mem24.cpp b/src/devices/mem24/base/mem24.cpp
index 03bffe3..147c199 100644
--- a/src/devices/mem24/base/mem24.cpp
+++ b/src/devices/mem24/base/mem24.cpp
@@ -8,13 +8,13 @@
  ***************************************************************************/
 #include "mem24.h"
 
-QDataStream &Mem24::operator <<(QDataStream &s, const Data &data)
+TQDataStream &Mem24::operator <<(TQDataStream &s, const Data &data)
 {
   s << static_cast<const Device::Data &>(data);
   s << data._nbBytes << data._nbBlocks << data._nbBytesPage;
   return s;
 }
-QDataStream &Mem24::operator >>(QDataStream &s, Data &data)
+TQDataStream &Mem24::operator >>(TQDataStream &s, Data &data)
 {
   s >> static_cast<Device::Data &>(data);
   s >> data._nbBytes >> data._nbBlocks >> data._nbBytesPage;
diff --git a/src/devices/mem24/base/mem24.h b/src/devices/mem24/base/mem24.h
index d66ff47..7e0b5e7 100644
--- a/src/devices/mem24/base/mem24.h
+++ b/src/devices/mem24/base/mem24.h
@@ -22,7 +22,7 @@ class Data : public Device::Data
 {
 public:
   Data() : Device::Data(0) {}
-  virtual QString listViewGroup() const { return i18n("24 EEPROM"); }
+  virtual TQString listViewGroup() const { return i18n("24 EEPROM"); }
   uint nbBytes() const { return _nbBytes; }
   virtual bool matchId(BitValue, Device::IdData &) const { return false; }
   virtual uint nbBitsAddress() const { return nbBits(_nbBytes-1); }
@@ -35,12 +35,12 @@ private:
 
   friend class XmlToData;
   friend class Group;
-  friend QDataStream &operator <<(QDataStream &s, const Data &data);
-  friend QDataStream &operator >>(QDataStream &s, Data &data);
+  friend TQDataStream &operator <<(TQDataStream &s, const Data &data);
+  friend TQDataStream &operator >>(TQDataStream &s, Data &data);
 };
 
-QDataStream &operator <<(QDataStream &s, const Data &data);
-QDataStream &operator >>(QDataStream &s, Data &data);
+TQDataStream &operator <<(TQDataStream &s, const Data &data);
+TQDataStream &operator >>(TQDataStream &s, Data &data);
 
 } // namespace
 
diff --git a/src/devices/mem24/gui/mem24_group_ui.cpp b/src/devices/mem24/gui/mem24_group_ui.cpp
index 751e5a7..8a8bb5a 100644
--- a/src/devices/mem24/gui/mem24_group_ui.cpp
+++ b/src/devices/mem24/gui/mem24_group_ui.cpp
@@ -10,7 +10,7 @@
 
 #include "mem24_hex_view.h"
 
-Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, QWidget *parent) const
+Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const
 {
-  return new HexView(editor, parent);
+  return new HexView(editor, tqparent);
 }
diff --git a/src/devices/mem24/gui/mem24_group_ui.h b/src/devices/mem24/gui/mem24_group_ui.h
index 37766b5..c2b3360 100644
--- a/src/devices/mem24/gui/mem24_group_ui.h
+++ b/src/devices/mem24/gui/mem24_group_ui.h
@@ -16,10 +16,10 @@ namespace Mem24
 class GroupUI : public Device::GroupUI
 {
 public:
-  virtual Device::HexView *createHexView(const HexEditor &editor, QWidget *parent) const;
-  virtual Register::View *createRegisterView(QWidget *) const { return 0; }
-  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &, QWidget *) const { return 0; }
-  virtual void fillWatchListContainer(ListContainer *, QValueVector<Register::TypeData> &) const {}
+  virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const;
+  virtual Register::View *createRegisterView(TQWidget *) const { return 0; }
+  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &, TQWidget *) const { return 0; }
+  virtual void fillWatchListContainer(ListContainer *, TQValueVector<Register::TypeData> &) const {}
   virtual Register::ListViewItem *createWatchItem(const Register::TypeData &, KListViewItem *) const { return 0; }
 };
 
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp
index 0ada8d0..7ded854 100644
--- a/src/devices/mem24/gui/mem24_hex_view.cpp
+++ b/src/devices/mem24/gui/mem24_hex_view.cpp
@@ -8,14 +8,14 @@
  ***************************************************************************/
 #include "mem24_hex_view.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 #include <klocale.h>
 
 #include "mem24_memory_editor.h"
 
-Mem24::HexView::HexView(const HexEditor &editor, QWidget *parent)
-  : Device::HexView(editor, parent, "mem24_hex_view")
+Mem24::HexView::HexView(const HexEditor &editor, TQWidget *tqparent)
+  : Device::HexView(editor, tqparent, "mem24_hex_view")
 {}
 
 void Mem24::HexView::display()
@@ -34,5 +34,5 @@ BitValue Mem24::HexView::checksum() const
   BitValue cs = 0x0000;
   for (uint i=0; i<static_cast<const Data &>(_memory->device()).nbBytes(); i++)
     cs += static_cast<const Memory *>(_memory)->byte(i);
-  return cs.maskWith(0xFFFF);
+  return cs.tqmaskWith(0xFFFF);
 }
diff --git a/src/devices/mem24/gui/mem24_hex_view.h b/src/devices/mem24/gui/mem24_hex_view.h
index 378a25e..199865a 100644
--- a/src/devices/mem24/gui/mem24_hex_view.h
+++ b/src/devices/mem24/gui/mem24_hex_view.h
@@ -9,7 +9,7 @@
 #ifndef MEM24_HEX_VIEW_H
 #define MEM24_HEX_VIEW_H
 
-class QVBoxLayout;
+class TQVBoxLayout;
 
 #include "devices/gui/hex_view.h"
 
@@ -19,8 +19,9 @@ namespace Mem24
 class HexView : public Device::HexView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexView(const HexEditor &editor, QWidget *parent);
+  HexView(const HexEditor &editor, TQWidget *tqparent);
   virtual uint nbChecksumChars() const { return 4; }
   virtual BitValue checksum() const;
 
diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp
index 61f98fe..a5203b9 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.cpp
+++ b/src/devices/mem24/gui/mem24_memory_editor.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "mem24_memory_editor.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 
@@ -19,19 +19,19 @@
 #include "devices/base/device_group.h"
 
 //-----------------------------------------------------------------------------
-Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, QWidget *parent)
-  : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, parent, "mem24_memory_range_editor"),
+Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, TQWidget *tqparent)
+  : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, tqparent, "mem24_memory_range_editor"),
     MemoryCaster(memory)
 {}
 
-Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(QWidget *parent)
+Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent)
 {
-  return new HexWordEditor(memory(), parent);
+  return new HexWordEditor(memory(), tqparent);
 }
 
 //-----------------------------------------------------------------------------
-Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, QWidget *parent)
-  : Device::MemoryTypeEditor(hexview, memory, parent, "mem24_memory_type_editor"),
+Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
+  : Device::MemoryTypeEditor(hexview, memory, tqparent, "mem24_memory_type_editor"),
     MemoryCaster(memory)
 {}
 
diff --git a/src/devices/mem24/gui/mem24_memory_editor.h b/src/devices/mem24/gui/mem24_memory_editor.h
index eb99e97..657810a 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.h
+++ b/src/devices/mem24/gui/mem24_memory_editor.h
@@ -34,12 +34,13 @@ private:
 class HexWordEditor : public Device::HexWordEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexWordEditor(Memory &memory, QWidget *parent)
-    : Device::HexWordEditor(memory, 2, parent), MemoryCaster(memory) {}
+  HexWordEditor(Memory &memory, TQWidget *tqparent)
+    : Device::HexWordEditor(memory, 2, tqparent), MemoryCaster(memory) {}
 
 private:
-  virtual BitValue mask() const { return 0xFF; }
+  virtual BitValue tqmask() const { return 0xFF; }
   virtual BitValue normalizeWord(BitValue value) const { return value; }
   virtual BitValue word() const { return memory().byte(_offset); }
   virtual void setWord(BitValue value) { memory().setByte(_offset, value); }
@@ -49,14 +50,15 @@ private:
 class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryRangeEditor(Memory &memory, QWidget *parent);
+  MemoryRangeEditor(Memory &memory, TQWidget *tqparent);
 
 private:
   virtual uint nbWords() const { return device().nbBytes(); }
   virtual uint addressIncrement() const { return 1; }
   virtual Address startAddress() const { return 0x0; }
-  virtual Device::HexWordEditor *createHexWordEditor(QWidget *parent);
+  virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent);
   virtual bool isRangeReadOnly() const { return false; }
 };
 
@@ -64,8 +66,9 @@ private:
 class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 
 private:
diff --git a/src/devices/mem24/mem24/mem24_group.cpp b/src/devices/mem24/mem24/mem24_group.cpp
index 53cad5b..f396027 100644
--- a/src/devices/mem24/mem24/mem24_group.cpp
+++ b/src/devices/mem24/mem24/mem24_group.cpp
@@ -15,19 +15,19 @@ Device::Memory *Mem24::Group::createMemory(const Device::Data &data) const
   return new Memory(static_cast<const Mem24::Data &>(data));
 }
 
-QString Mem24::Group::informationHtml(const Device::Data &data) const
+TQString Mem24::Group::informationHtml(const Device::Data &data) const
 {
   const Mem24::Data &mdata = static_cast<const Mem24::Data &>(data);
-  QString tmp = i18n("%1 bytes").arg(formatNumber(mdata.nbBytes()));
+  TQString tmp = i18n("%1 bytes").tqarg(formatNumber(mdata.nbBytes()));
   return htmlTableRow(i18n("Memory Size"), tmp);
 }
 
 #if !defined(NO_KDE)
-QPixmap Mem24::Group::memoryGraph(const Device::Data &data) const
+TQPixmap Mem24::Group::memoryGraph(const Device::Data &data) const
 {
   const Mem24::Data &mdata = static_cast<const Mem24::Data &>(data);
   uint offset = 0x0;
-  QValueList<Device::MemoryGraphData> ranges;
+  TQValueList<Device::MemoryGraphData> ranges;
   for (uint i=0; i<mdata.nbBlocks(); i++) {
     Device::MemoryGraphData data;
     data.startAddress = offset;
@@ -35,7 +35,7 @@ QPixmap Mem24::Group::memoryGraph(const Device::Data &data) const
     data.endAddress = offset - 1;
     data.start = toHexLabel(data.startAddress, mdata.nbCharsAddress());
     data.end = toHexLabel(data.endAddress, mdata.nbCharsAddress());
-    data.label = i18n("Block #%1").arg(i+1);
+    data.label = i18n("Block #%1").tqarg(i+1);
     ranges.append(data);
   }
   return Device::memoryGraph(ranges);
diff --git a/src/devices/mem24/mem24/mem24_group.h b/src/devices/mem24/mem24/mem24_group.h
index 46a1234..f39bf5f 100644
--- a/src/devices/mem24/mem24/mem24_group.h
+++ b/src/devices/mem24/mem24/mem24_group.h
@@ -21,12 +21,12 @@ extern const char *DATA_STREAM;
 class Group : public Device::Group<Data>
 {
 public:
-  virtual QString name() const { return "mem24"; }
-  virtual QString label() const { return i18n("Serial Memory 24"); }
+  virtual TQString name() const { return "mem24"; }
+  virtual TQString label() const { return i18n("Serial Memory 24"); }
   virtual Device::Memory *createMemory(const Device::Data &data) const;
-  virtual QString informationHtml(const Device::Data &data) const;
+  virtual TQString informationHtml(const Device::Data &data) const;
 #if !defined(NO_KDE)
-  virtual QPixmap memoryGraph(const Device::Data &data) const;
+  virtual TQPixmap memoryGraph(const Device::Data &data) const;
 #endif
 
 private:
diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp
index a4296ea..b09aa79 100644
--- a/src/devices/mem24/mem24/mem24_memory.cpp
+++ b/src/devices/mem24/mem24/mem24_memory.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "mem24_memory.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include "common/global/global.h"
 #include "common/common/misc.h"
@@ -34,7 +34,7 @@ void Mem24::Memory::copyFrom(const Device::Memory &memory)
 Device::Array Mem24::Memory::arrayForWriting() const
 {
   Device::Array data(_data.count());
-  for (uint i=0; i<data.count(); i++) data[i] = _data[i].maskWith(0xFF);
+  for (uint i=0; i<data.count(); i++) data[i] = _data[i].tqmaskWith(0xFF);
   return data;
 }
 
@@ -55,11 +55,11 @@ BitValue Mem24::Memory::checksum() const
 {
   BitValue cs = 0x0000;
   for (uint i=0; i<_data.count(); i++) cs += _data[i];
-  return cs.maskWith(0xFFFF);
+  return cs.tqmaskWith(0xFFFF);
 }
 
 //-----------------------------------------------------------------------------
-void Mem24::Memory::savePartial(QTextStream &stream, HexBuffer::Format format) const
+void Mem24::Memory::savePartial(TQTextStream &stream, HexBuffer::Format format) const
 {
   HexBuffer hb = toHexBuffer();
   hb.savePartial(stream, format);
@@ -74,19 +74,19 @@ HexBuffer Mem24::Memory::toHexBuffer() const
 }
 
 void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result,
-                                      QStringList &warnings, QMap<uint, bool> &inRange)
+                                      TQStringList &warnings, TQMap<uint, bool> &inRange)
 {
-  BitValue mask = 0xFF;
+  BitValue tqmask = 0xFF;
   for (uint k=0; k<device().nbBytes(); k++) {
     _data[k] = hb[k];
     if ( _data[k].isInitialized() ) {
       inRange[k] = true;
-      if ( !(result & ValueTooLarge) && !_data[k].isInside(mask) ) {
+      if ( !(result & ValueTooLarge) && !_data[k].isInside(tqmask) ) {
         result |= ValueTooLarge;
-        warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).")
-                    .arg(toHexLabel(k, 8)).arg(toHexLabel(_data[k], 8)).arg(toHexLabel(mask, 8));
+        warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).")
+                    .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(tqmask, 8));
       }
-      _data[k] = _data[k].maskWith(mask);
+      _data[k] = _data[k].tqmaskWith(tqmask);
     }
   }
 }
diff --git a/src/devices/mem24/mem24/mem24_memory.h b/src/devices/mem24/mem24/mem24_memory.h
index fbd6c64..bde2729 100644
--- a/src/devices/mem24/mem24/mem24_memory.h
+++ b/src/devices/mem24/mem24/mem24_memory.h
@@ -35,9 +35,9 @@ public:
 private:
   Device::Array _data;
 
-  virtual void savePartial(QTextStream &stream, HexBuffer::Format format) const;
+  virtual void savePartial(TQTextStream &stream, HexBuffer::Format format) const;
   virtual void fromHexBuffer(const HexBuffer &hb, WarningTypes &warningTypes,
-                             QStringList &warnings, QMap<uint, bool> &inRange);
+                             TQStringList &warnings, TQMap<uint, bool> &inRange);
 };
 
 } // namespace
diff --git a/src/devices/mem24/prog/mem24_prog.cpp b/src/devices/mem24/prog/mem24_prog.cpp
index 4c4b201..338c217 100644
--- a/src/devices/mem24/prog/mem24_prog.cpp
+++ b/src/devices/mem24/prog/mem24_prog.cpp
@@ -32,15 +32,15 @@ bool Programmer::Mem24DeviceSpecific::write(const Device::Array &data)
 bool Programmer::Mem24DeviceSpecific::verifyByte(uint index, BitValue d, const VerifyData &vdata)
 {
   BitValue v = static_cast<const Mem24::Memory &>(vdata.memory).byte(index);
-  v = v.maskWith(0xFF);
-  d = d.maskWith(0xFF);
+  v = v.tqmaskWith(0xFF);
+  d = d.tqmaskWith(0xFF);
   if ( v==d ) return true;
   Address address = index;
   if ( vdata.actions & BlankCheckVerify )
     log(Log::LineType::Error, i18n("Device memory is not blank (at address %1: reading %2 and expecting %3).")
-                    .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+                    .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
   else log(Log::LineType::Error, i18n("Device memory doesn't match hex file (at address %1: reading %2 and expecting %3).")
-                       .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+                       .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
   return false;
 }
 
diff --git a/src/devices/mem24/prog/mem24_prog.h b/src/devices/mem24/prog/mem24_prog.h
index 86948c2..b2d699f 100644
--- a/src/devices/mem24/prog/mem24_prog.h
+++ b/src/devices/mem24/prog/mem24_prog.h
@@ -34,7 +34,7 @@ protected:
 class Mem24Hardware : public Hardware
 {
 public:
-  Mem24Hardware(::Programmer::Base &base, Port::Base *port, const QString &name) : Hardware(base, port, name) {}
+  Mem24Hardware(::Programmer::Base &base, Port::Base *port, const TQString &name) : Hardware(base, port, name) {}
   const Mem24::Data &device() const { return static_cast<const Mem24::Data &>(*_base.device()); }
 };
 
diff --git a/src/devices/mem24/xml/mem24_xml_to_data.cpp b/src/devices/mem24/xml/mem24_xml_to_data.cpp
index 734ebca..d38d669 100644
--- a/src/devices/mem24/xml/mem24_xml_to_data.cpp
+++ b/src/devices/mem24/xml/mem24_xml_to_data.cpp
@@ -6,8 +6,8 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 #include "xml_to_data/device_xml_to_data.h"
 #include "common/common/misc.h"
@@ -21,13 +21,13 @@ class XmlToData : public Device::XmlToData<Data>
 private:
   virtual uint nbOutputFiles(uint) const { return 1; }
   virtual bool isIncluded(uint, uint) const { return true; }
-  virtual QString namespaceName() const { return "Mem24"; }
+  virtual TQString namespaceName() const { return "Mem24"; }
 
-virtual void processDevice(QDomElement device)
+virtual void processDevice(TQDomElement device)
 {
   Device::XmlToDataBase::processDevice(device);
 
-  QDomElement e = findUniqueElement(device, "memory", "name", QString::null);
+  TQDomElement e = findUniqueElement(device, "memory", "name", TQString());
   bool ok;
   data()->_nbBytes = fromHexLabel(e.attribute("size"), &ok);
   if ( !ok ) qFatal("Missing or invalid size");
@@ -38,18 +38,18 @@ virtual void processDevice(QDomElement device)
   data()->_nbBytesPage = e.attribute("page_size").toUInt(&ok);
   if ( !ok || data()->_nbBytesPage==0 ) qFatal("Missing, zero, or invalid page_size");
   if ( ((data()->_nbBytes/data()->_nbBlocks) % data()->_nbBytesPage)!=0 ) qFatal("page_size should divide size/nb_blocks");
-  QStringList names;
-  names.append(QString::null);
+  TQStringList names;
+  names.append(TQString());
   checkTagNames(device, "memory", names);
 }
 
-virtual void checkPins(const QMap<QString, uint> &pinLabels) const
+virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
 {
-  if ( !pinLabels.contains("VCC") ) qFatal("No VDD pin specified");
-  if ( !pinLabels.contains("VSS") ) qFatal("No VSS pin specified");
-  QMap<QString, uint>::const_iterator it;
+  if ( !pinLabels.tqcontains("VCC") ) qFatal("No VDD pin specified");
+  if ( !pinLabels.tqcontains("VSS") ) qFatal("No VSS pin specified");
+  TQMap<TQString, uint>::const_iterator it;
   for (it=pinLabels.begin(); it!=pinLabels.end(); ++it)
-    if ( it.data()!=1 ) qFatal(QString("Duplicated pin %1").arg(it.key()));
+    if ( it.data()!=1 ) qFatal(TQString("Duplicated pin %1").tqarg(it.key()));
 }
 
 }; // class
diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp
index 8f81540..b58f480 100644
--- a/src/devices/pic/base/pic.cpp
+++ b/src/devices/pic/base/pic.cpp
@@ -138,9 +138,9 @@ uint Pic::Data::nbAddresses(MemoryRangeType type) const
   return (range(type).end - range(type).start + 1);
 }
 
-QString Pic::Data::fname(Device::Special special) const
+TQString Pic::Data::fname(Device::Special special) const
 {
-  QString s = name();
+  TQString s = name();
   switch (special.type()) {
     case Device::Special::Normal: break;
     case Device::Special::LowPower:
@@ -149,11 +149,11 @@ QString Pic::Data::fname(Device::Special special) const
       break;
     case Device::Special::LowVoltage:
       // assume name is of form "NNXN..."
-      s.replace(2, 1, "LV");
+      s.tqreplace(2, 1, "LV");
       break;
     case Device::Special::HighVoltage:
       // assume name is of form "NNXN..."
-      s.replace(2, 1, "HV");
+      s.tqreplace(2, 1, "HV");
       break;
     case Device::Special::Nb_Types: Q_ASSERT(false); break;
   }
@@ -163,7 +163,7 @@ QString Pic::Data::fname(Device::Special special) const
 bool Pic::Data::matchId(BitValue rawId, Device::IdData &idata) const
 {
   if ( !isPresent(MemoryRangeType::DeviceId) ) return false;
-  QMap<Device::Special, BitValue>::const_iterator it;
+  TQMap<Device::Special, BitValue>::const_iterator it;
   for (it=_ids.begin(); it!=_ids.end(); ++it) {
     idata.special = it.key();
     BitValue nid = 0x0;
@@ -175,23 +175,23 @@ bool Pic::Data::matchId(BitValue rawId, Device::IdData &idata) const
       case Architecture::P18F:
       case Architecture::P18J:
         nid = rawId.clearMaskBits(0x1F);
-        idata.revision = rawId.maskWith(0x1F);
+        idata.revision = rawId.tqmaskWith(0x1F);
         break;
       case Architecture::P24F:
-        nid = (rawId >> 16).maskWith(0x3FFF);
-        idata.revision = (rawId >> 6).maskWith(0x7);
-        idata.minorRevision = rawId.maskWith(0x7);
+        nid = (rawId >> 16).tqmaskWith(0x3FFF);
+        idata.revision = (rawId >> 6).tqmaskWith(0x7);
+        idata.minorRevision = rawId.tqmaskWith(0x7);
         break;
       case Architecture::P30F:
-        nid = (rawId >> 16).maskWith(0xFFFF);
-        idata.revision = (rawId >> 6).maskWith(0x3F);
-        idata.minorRevision = rawId.maskWith(0x3F);
-        idata.process = (rawId >> 12).maskWith(0xF);
+        nid = (rawId >> 16).tqmaskWith(0xFFFF);
+        idata.revision = (rawId >> 6).tqmaskWith(0x3F);
+        idata.minorRevision = rawId.tqmaskWith(0x3F);
+        idata.process = (rawId >> 12).tqmaskWith(0xF);
         break;
       case Architecture::P24H:
       case Architecture::P33F:
-        nid = (rawId >> 16).maskWith(0xFFFF);
-        idata.revision = rawId.maskWith(0xFFFF); // ??
+        nid = (rawId >> 16).tqmaskWith(0xFFFF);
+        idata.revision = rawId.tqmaskWith(0xFFFF); // ??
         break;
       case Architecture::Nb_Types: Q_ASSERT(false); break;
     }
@@ -200,10 +200,10 @@ bool Pic::Data::matchId(BitValue rawId, Device::IdData &idata) const
   return false;
 }
 
-QStringList Pic::Data::idNames(const QMap<QString, Device::IdData> &ids) const
+TQStringList Pic::Data::idNames(const TQMap<TQString, Device::IdData> &ids) const
 {
-  QStringList list;
-  QMap<QString, Device::IdData>::const_iterator it;
+  TQStringList list;
+  TQMap<TQString, Device::IdData>::const_iterator it;
   for (it=ids.begin(); it!=ids.end(); ++it) {
     switch (_architecture.type()) {
       case Architecture::P10X:
@@ -212,17 +212,17 @@ QStringList Pic::Data::idNames(const QMap<QString, Device::IdData> &ids) const
       case Architecture::P18C:
       case Architecture::P18F:
       case Architecture::P18J:
-        list += i18n("%1 (rev. %2)").arg(it.key()).arg(toLabel(it.data().revision));
+        list += i18n("%1 (rev. %2)").tqarg(it.key()).tqarg(toLabel(it.data().revision));
         break;
       case Architecture::P24F:
-        list += i18n("%1 (rev. %2.%3)").arg(it.key()).arg(toLabel(it.data().revision)).arg(toLabel(it.data().minorRevision));
+        list += i18n("%1 (rev. %2.%3)").tqarg(it.key()).tqarg(toLabel(it.data().revision)).tqarg(toLabel(it.data().minorRevision));
         break;
       case Architecture::P30F:
-        list += i18n("%1 (proc. %2; rev. %3.%4)").arg(it.key()).arg(toLabel(it.data().process)).arg(toLabel(it.data().revision)).arg(toLabel(it.data().minorRevision));
+        list += i18n("%1 (proc. %2; rev. %3.%4)").tqarg(it.key()).tqarg(toLabel(it.data().process)).tqarg(toLabel(it.data().revision)).tqarg(toLabel(it.data().minorRevision));
         break;
       case Architecture::P24H:
       case Architecture::P33F:
-        list += i18n("%1 (rev. %2)").arg(it.key()).arg(toLabel(it.data().revision));
+        list += i18n("%1 (rev. %2)").tqarg(it.key()).tqarg(toLabel(it.data().revision));
         break;
       case Architecture::Nb_Types: Q_ASSERT(false); break;
     }
@@ -230,20 +230,20 @@ QStringList Pic::Data::idNames(const QMap<QString, Device::IdData> &ids) const
   return list;
 }
 
-bool Pic::Data::checkCalibration(const Device::Array &data, QString *message) const
+bool Pic::Data::checkCalibration(const Device::Array &data, TQString *message) const
 {
   Q_ASSERT( nbWords(MemoryRangeType::Cal)==data.count() );
   for (uint i=0; i<data.count(); i++) {
-    QString address = toHexLabel(range(MemoryRangeType::Cal).start + i*addressIncrement(MemoryRangeType::Cal), nbCharsAddress());
-    if ( data[i]==mask(MemoryRangeType::Cal) ) {
-      if (message) *message = i18n("Calibration word at address %1 is blank.").arg(address);
+    TQString address = toHexLabel(range(MemoryRangeType::Cal).start + i*addressIncrement(MemoryRangeType::Cal), nbCharsAddress());
+    if ( data[i]==tqmask(MemoryRangeType::Cal) ) {
+      if (message) *message = i18n("Calibration word at address %1 is blank.").tqarg(address);
       return false;
     }
   }
   if ( data.count()==1 ) {
-    if ( data[0].maskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
+    if ( data[0].tqmaskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
       if (message) *message = i18n("Calibration word is not a compatible opcode (%2).")
-                              .arg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
+                              .tqarg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
       return false;
     }
   }
@@ -261,21 +261,21 @@ bool Pic::Data::hasFeature(Feature feature, bool *unknown) const
   if (unknown) *unknown = !ok;
   if (!ok) return false;
   switch (feature.type()) {
-    case Feature::CCP: return registersData().sfrs.contains("CCP1CON");
-    case Feature::ADC: return registersData().sfrs.contains("ADCON0");
-    case Feature::SSP: return registersData().sfrs.contains("SSPCON");
-    case Feature::LVD: return registersData().sfrs.contains("LVDCON");
-    case Feature::USB: return registersData().sfrs.contains("UCON");
+    case Feature::CCP: return registersData().sfrs.tqcontains("CCP1CON");
+    case Feature::ADC: return registersData().sfrs.tqcontains("ADCON0");
+    case Feature::SSP: return registersData().sfrs.tqcontains("SSPCON");
+    case Feature::LVD: return registersData().sfrs.tqcontains("LVDCON");
+    case Feature::USB: return registersData().sfrs.tqcontains("UCON");
     case Feature::USART:
-      return ( registersData().sfrs.contains("TXSTA")        // 16F
-               || registersData().sfrs.contains("TXSTA1")    // 18F
-               || registersData().sfrs.contains("U1MODE") ); // 30F
-    case Feature::CAN: return registersData().sfrs.contains("CANCON") && !registersData().sfrs.contains("ECANCON");
-    case Feature::ECAN: return registersData().sfrs.contains("ECANCON");
-    case Feature::Ethernet: return registersData().sfrs.contains("ETHCON1");
-    case Feature::LCD: return registersData().sfrs.contains("LCDCON");
-    case Feature::MotorControl: return registersData().sfrs.contains("PWMCON0");
-    case Feature::MotionFeedback: return registersData().sfrs.contains("CAP1CON");
+      return ( registersData().sfrs.tqcontains("TXSTA")        // 16F
+               || registersData().sfrs.tqcontains("TXSTA1")    // 18F
+               || registersData().sfrs.tqcontains("U1MODE") ); // 30F
+    case Feature::CAN: return registersData().sfrs.tqcontains("CANCON") && !registersData().sfrs.tqcontains("ECANCON");
+    case Feature::ECAN: return registersData().sfrs.tqcontains("ECANCON");
+    case Feature::Ethernet: return registersData().sfrs.tqcontains("ETHCON1");
+    case Feature::LCD: return registersData().sfrs.tqcontains("LCDCON");
+    case Feature::MotorControl: return registersData().sfrs.tqcontains("PWMCON0");
+    case Feature::MotionFeedback: return registersData().sfrs.tqcontains("CAP1CON");
     case Feature::SelfWrite: return _selfWrite==SelfWrite::Yes;
     case Feature::Nb_Types: Q_ASSERT(false); break;
   }
@@ -326,16 +326,16 @@ Device::Array Pic::Data::gotoInstruction(Address address, bool withPageSelection
 bool Pic::Data::isGotoInstruction(BitValue instruction) const
 {
   switch (_architecture.type()) {
-  case Architecture::P10X: return ( instruction.maskWith(0xE00)==0xA00 );
-  case Architecture::P16X: return ( instruction.maskWith(0xF800)==0x2800 );
-  case Architecture::P17C: return ( instruction.maskWith(0xE000)==0xC000 );
+  case Architecture::P10X: return ( instruction.tqmaskWith(0xE00)==0xA00 );
+  case Architecture::P16X: return ( instruction.tqmaskWith(0xF800)==0x2800 );
+  case Architecture::P17C: return ( instruction.tqmaskWith(0xE000)==0xC000 );
   case Architecture::P18C:
   case Architecture::P18F:
-  case Architecture::P18J: return ( instruction.maskWith(0xFF00)==0xEF00 );
+  case Architecture::P18J: return ( instruction.tqmaskWith(0xFF00)==0xEF00 );
   case Architecture::P24F:
   case Architecture::P24H:
   case Architecture::P30F:
-  case Architecture::P33F: return ( instruction.maskWith(0xFF0000)==0x040000 );
+  case Architecture::P33F: return ( instruction.tqmaskWith(0xFF0000)==0x040000 );
   case Architecture::Nb_Types: Q_ASSERT(false); break;
   }
   return false;
@@ -344,59 +344,59 @@ bool Pic::Data::isGotoInstruction(BitValue instruction) const
 uint Pic::Data::nbWordsWriteAlignment(MemoryRangeType type) const
 {
   if ( type!=MemoryRangeType::Code ) return 1;
-  return QMAX(_nbWordsCodeWrite, uint(16));
+  return TQMAX(_nbWordsCodeWrite, uint(16));
 }
 
 //----------------------------------------------------------------------------
-QDataStream &operator <<(QDataStream &s, const Pic::VoltageData &vd)
+TQDataStream &operator <<(TQDataStream &s, const Pic::VoltageData &vd)
 {
   s << vd.min << vd.max << vd.nominal;
   return s;
 }
-QDataStream &operator >>(QDataStream &s, Pic::VoltageData &vd)
+TQDataStream &operator >>(TQDataStream &s, Pic::VoltageData &vd)
 {
   s >> vd.min >> vd.max >> vd.nominal;
   return s;
 }
 
-QDataStream &operator <<(QDataStream &s, const Pic::MemoryRangeData &mrd)
+TQDataStream &operator <<(TQDataStream &s, const Pic::MemoryRangeData &mrd)
 {
-  s << Q_UINT8(mrd.properties) << mrd.start << mrd.end << mrd.hexFileOffset;
+  s << TQ_UINT8(mrd.properties) << mrd.start << mrd.end << mrd.hexFileOffset;
   return s;
 }
-QDataStream &operator >>(QDataStream &s, Pic::MemoryRangeData &mrd)
+TQDataStream &operator >>(TQDataStream &s, Pic::MemoryRangeData &mrd)
 {
-  Q_UINT8 properties;
+  TQ_UINT8 properties;
   s >> properties >> mrd.start >> mrd.end >> mrd.hexFileOffset;
   mrd.properties = Pic::MemoryRangeProperties(properties);
   return s;
 }
 
-QDataStream &operator <<(QDataStream &s, const Pic::Checksum::Data &cd)
+TQDataStream &operator <<(TQDataStream &s, const Pic::Checksum::Data &cd)
 {
   s << cd.constant << cd.bbsize << cd.algorithm << cd.protectedMaskNames;
   s << cd.blankChecksum << cd.checkChecksum;
   return s;
 }
-QDataStream &operator >>(QDataStream &s, Pic::Checksum::Data &cd)
+TQDataStream &operator >>(TQDataStream &s, Pic::Checksum::Data &cd)
 {
   s >> cd.constant >> cd.bbsize >> cd.algorithm >> cd.protectedMaskNames;
   s >> cd.blankChecksum >> cd.checkChecksum;
   return s;
 }
 
-QDataStream &operator <<(QDataStream &s, const Pic::CalibrationData &cd)
+TQDataStream &operator <<(TQDataStream &s, const Pic::CalibrationData &cd)
 {
   s << cd.opcode << cd.opcodeMask;
   return s;
 }
-QDataStream &operator >>(QDataStream &s, Pic::CalibrationData &cd)
+TQDataStream &operator >>(TQDataStream &s, Pic::CalibrationData &cd)
 {
   s >> cd.opcode >> cd.opcodeMask;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const Pic::Data &data)
+TQDataStream &Pic::operator <<(TQDataStream &s, const Pic::Data &data)
 {
   s << static_cast<const Device::Data &>(data);
   s << data._architecture << data._ids << data._nbBitsPC;
@@ -410,7 +410,7 @@ QDataStream &Pic::operator <<(QDataStream &s, const Pic::Data &data)
   s << data._selfWrite;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, Pic::Data &data)
+TQDataStream &Pic::operator >>(TQDataStream &s, Pic::Data &data)
 {
   s >> static_cast<Device::Data &>(data);
   s >> data._architecture >> data._ids >> data._nbBitsPC;
diff --git a/src/devices/pic/base/pic.h b/src/devices/pic/base/pic.h
index 7b0dfc4..17fb96a 100644
--- a/src/devices/pic/base/pic.h
+++ b/src/devices/pic/base/pic.h
@@ -9,8 +9,8 @@
 #ifndef PIC_H
 #define PIC_H
 
-#include <qstringlist.h>
-#include <qmap.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
 
 #include "common/global/global.h"
 #include "common/common/bitvalue.h"
@@ -38,8 +38,8 @@ struct CalibrationData {
 };
 
 enum MemoryRangeTypeProperty { ReadOnly = 0, Writable = 1 };
-Q_DECLARE_FLAGS(MemoryRangeTypeProperties, MemoryRangeTypeProperty)
-Q_DECLARE_OPERATORS_FOR_FLAGS(MemoryRangeTypeProperties)
+TQ_DECLARE_FLAGS(MemoryRangeTypeProperties, MemoryRangeTypeProperty)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(MemoryRangeTypeProperties)
 struct MemoryRangeTypeData {
   const char *key, *label;
   MemoryRangeTypeProperties properties;
@@ -73,8 +73,8 @@ BEGIN_DECLARE_ENUM(Architecture)
 END_DECLARE_ENUM(Architecture, ArchitectureData)
 
 enum MemoryRangeProperty { NotPresent = 0, Present = 1, Programmable = 2 };
-Q_DECLARE_FLAGS(MemoryRangeProperties, MemoryRangeProperty)
-Q_DECLARE_OPERATORS_FOR_FLAGS(MemoryRangeProperties)
+TQ_DECLARE_FLAGS(MemoryRangeProperties, MemoryRangeProperty)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(MemoryRangeProperties)
 struct MemoryRangeData {
   MemoryRangeProperties properties;
   Address start, end;
@@ -90,8 +90,8 @@ namespace Checksum
   public:
     BitValue constant;
     Algorithm algorithm;
-    QStringList protectedMaskNames;
-    QString bbsize;
+    TQStringList protectedMaskNames;
+    TQString bbsize;
     BitValue blankChecksum, checkChecksum;
   };
 } // namespace
@@ -107,8 +107,8 @@ class Data : public Device::Data
 public:
   Data();
   virtual ~Data();
-  virtual QString fname(Device::Special special) const;
-  virtual QString listViewGroup() const { return _architecture.label(); }
+  virtual TQString fname(Device::Special special) const;
+  virtual TQString listViewGroup() const { return _architecture.label(); }
   bool isPresent(MemoryRangeType type) const { return (range(type).properties & Present); }
   bool isReadable(MemoryRangeType type) const;
   bool isWritable(MemoryRangeType type) const;
@@ -121,7 +121,7 @@ public:
   uint nbBitsWord(MemoryRangeType type) const { return _architecture.data().nbBits[type.type()]; }
   uint nbBytesWord(MemoryRangeType type) const { return nbBitsToNbBytes(nbBitsWord(type)); }
   uint nbCharsWord(MemoryRangeType type) const { return nbBitsToNbChars(nbBitsWord(type)); }
-  BitValue mask(MemoryRangeType type) const { return uint(1 << nbBitsWord(type))-1; }
+  BitValue tqmask(MemoryRangeType type) const { return uint(1 << nbBitsWord(type))-1; }
   BitValue userIdRecommendedMask() const { return _userIdRecommendedMask; }
   const Config &config() const { return *_config; }
   Architecture architecture() const { return _architecture; }
@@ -129,11 +129,11 @@ public:
   bool is16bitFamily() const { return ( _architecture.data().nbBitsRegister==16 ); }
   VoltageData voltage(ProgVoltageType type) const { return _voltages[type]; }
   virtual bool canWriteCalibration() const { return isWritable(MemoryRangeType::Cal); }
-  bool checkCalibration(const Device::Array &data, QString *message = 0) const;
-  const QMap<Device::Special, BitValue> ids() const { return _ids; }
+  bool checkCalibration(const Device::Array &data, TQString *message = 0) const;
+  const TQMap<Device::Special, BitValue> ids() const { return _ids; }
   virtual bool matchId(BitValue rawId, Device::IdData &data) const;
-  QStringList idNames(const QMap<QString, Device::IdData> &ids) const;
-  const QMap<QString, Checksum::Data> checksums() const { return _checksums; }
+  TQStringList idNames(const TQMap<TQString, Device::IdData> &ids) const;
+  const TQMap<TQString, Checksum::Data> checksums() const { return _checksums; }
   const RegistersData &registersData() const;
   const CalibrationData &calibrationData() const { return _calibration; }
 
@@ -144,36 +144,36 @@ public:
 
 private:
   Architecture _architecture;
-  QMap<Device::Special, BitValue> _ids;
+  TQMap<Device::Special, BitValue> _ids;
   uint             _nbBitsPC;
   uint             _nbWordsCodeWrite;    // #### only for 18F/18J devices [0 for other devices]
   uint             _nbWordsCodeRowErase; // #### only for 18F/18J devices [0 for other devices or if not available]
-  QMap<ProgVoltageType, VoltageData>     _voltages;
-  QMap<MemoryRangeType, MemoryRangeData> _ranges;
+  TQMap<ProgVoltageType, VoltageData>     _voltages;
+  TQMap<MemoryRangeType, MemoryRangeData> _ranges;
   BitValue         _userIdRecommendedMask;
   Config          *_config;
-  QMap<QString, Checksum::Data> _checksums;
+  TQMap<TQString, Checksum::Data> _checksums;
   CalibrationData  _calibration;
   SelfWrite        _selfWrite;
 
   friend class XmlToData;
   friend class Group;
-  friend QDataStream &operator <<(QDataStream &s, const Data &data);
-  friend QDataStream &operator >>(QDataStream &s, Data &data);
+  friend TQDataStream &operator <<(TQDataStream &s, const Data &data);
+  friend TQDataStream &operator >>(TQDataStream &s, Data &data);
 };
 
-QDataStream &operator <<(QDataStream &s, const Data &data);
-QDataStream &operator >>(QDataStream &s, Data &data);
+TQDataStream &operator <<(TQDataStream &s, const Data &data);
+TQDataStream &operator >>(TQDataStream &s, Data &data);
 
 } // namespace
 
-QDataStream &operator <<(QDataStream &s, const Pic::VoltageData &vd);
-QDataStream &operator >>(QDataStream &s, Pic::VoltageData &vd);
-QDataStream &operator <<(QDataStream &s, const Pic::MemoryRangeData &mrd);
-QDataStream &operator >>(QDataStream &s, Pic::MemoryRangeData &mrd);
-QDataStream &operator <<(QDataStream &s, const Pic::Checksum::Data &cd);
-QDataStream &operator >>(QDataStream &s, Pic::Checksum::Data &cd);
-QDataStream &operator <<(QDataStream &s, const Pic::CalibrationData &cd);
-QDataStream &operator >>(QDataStream &s, Pic::CalibrationData &cd);
+TQDataStream &operator <<(TQDataStream &s, const Pic::VoltageData &vd);
+TQDataStream &operator >>(TQDataStream &s, Pic::VoltageData &vd);
+TQDataStream &operator <<(TQDataStream &s, const Pic::MemoryRangeData &mrd);
+TQDataStream &operator >>(TQDataStream &s, Pic::MemoryRangeData &mrd);
+TQDataStream &operator <<(TQDataStream &s, const Pic::Checksum::Data &cd);
+TQDataStream &operator >>(TQDataStream &s, Pic::Checksum::Data &cd);
+TQDataStream &operator <<(TQDataStream &s, const Pic::CalibrationData &cd);
+TQDataStream &operator >>(TQDataStream &s, Pic::CalibrationData &cd);
 
 #endif
diff --git a/src/devices/pic/base/pic_config.cpp b/src/devices/pic/base/pic_config.cpp
index 6672794..811a38e 100644
--- a/src/devices/pic/base/pic_config.cpp
+++ b/src/devices/pic/base/pic_config.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pic_config.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 const Pic::ConfigNameType::Data Pic::ConfigNameType::DATA[Nb_Types] = {
   { "cname", 0 },
@@ -218,8 +218,8 @@ const Pic::Config::Data Pic::Config::DATA[] = {
     { "20BIT", I18N_NOOP("20-bit external bus") }, { 0, 0 } } },
   { { "EASHFT", I18N_NOOP("External address bus shift") }, Toggle, { { 0, 0 } } },
   { { "MSSPSEL", I18N_NOOP("MSSP address select bit") }, Fixed, {
-    { "7BIT", I18N_NOOP("7-bit address mask mode") },
-    { "5BIT", I18N_NOOP("5-bit address mask mode") }, { 0, 0 } } },
+    { "7BIT", I18N_NOOP("7-bit address tqmask mode") },
+    { "5BIT", I18N_NOOP("5-bit address tqmask mode") }, { 0, 0 } } },
   { { "PMPMX", I18N_NOOP("PMP pin select bit") }, Fixed, {
     { "Connected", I18N_NOOP("Connected to EMB") },
     { "NotConnected", I18N_NOOP("Not connected to EMB") }, { 0, 0 } } },
@@ -280,60 +280,60 @@ const Pic::Config::Data Pic::Config::DATA[] = {
   { { 0, 0 }, Fixed, { { 0, 0 } } }
 };
 
-QMap<QString, Pic::Config::MapData> *Pic::Config::_masks = 0;
-QMap<QString, Pic::Config::MapData> &Pic::Config::masks()
+TQMap<TQString, Pic::Config::MapData> *Pic::Config::_tqmasks = 0;
+TQMap<TQString, Pic::Config::MapData> &Pic::Config::tqmasks()
 {
-  if ( _masks==0 ) {
-    _masks = new QMap<QString, MapData>;
-    for (uint i=0; DATA[i].mask.name; i++) {
-      (*_masks)[DATA[i].mask.name] = MapData(i, -1);
+  if ( _tqmasks==0 ) {
+    _tqmasks = new TQMap<TQString, MapData>;
+    for (uint i=0; DATA[i].tqmask.name; i++) {
+      (*_tqmasks)[DATA[i].tqmask.name] = MapData(i, -1);
       if ( DATA[i].type==MemoryRange ) {
         for (uint k=0; k<Protection::MAX_NB_BLOCKS; k++)
-          (*_masks)[QString("%1_%2").arg(DATA[i].mask.name).arg(k)] = MapData(i, k);
+          (*_tqmasks)[TQString("%1_%2").tqarg(DATA[i].tqmask.name).tqarg(k)] = MapData(i, k);
       }
     }
   }
-  return *_masks;
+  return *_tqmasks;
 }
 
-bool Pic::Config::hasMaskName(const QString &mask)
+bool Pic::Config::hasMaskName(const TQString &tqmask)
 {
-  return masks().contains(mask);
+  return tqmasks().tqcontains(tqmask);
 }
 
-QString Pic::Config::maskLabel(const QString &mask)
+TQString Pic::Config::tqmaskLabel(const TQString &tqmask)
 {
-  const MapData &mp = masks()[mask];
-  QString s = i18n(DATA[mp.index].mask.label);
-  if ( mp.block>=0 ) return i18n("%1 for block %2").arg(s).arg(mp.block);
+  const MapData &mp = tqmasks()[tqmask];
+  TQString s = i18n(DATA[mp.index].tqmask.label);
+  if ( mp.block>=0 ) return i18n("%1 for block %2").tqarg(s).tqarg(mp.block);
   return s;
 }
 
-const Pic::Config::Mask *Pic::Config::findMask(const QString &mask, uint *wordIndex) const
+const Pic::Config::Mask *Pic::Config::findMask(const TQString &tqmask, uint *wordIndex) const
 {
   for (uint i=0; i<uint(_words.count()); i++)
-    for (uint k=0; k<uint(_words[i].masks.count()); k++) {
-      if ( _words[i].masks[k].name==mask ) {
+    for (uint k=0; k<uint(_words[i].tqmasks.count()); k++) {
+      if ( _words[i].tqmasks[k].name==tqmask ) {
         if (wordIndex) *wordIndex = i;
-        return &_words[i].masks[k];
+        return &_words[i].tqmasks[k];
       }
     }
   return 0;
 }
 
-const Pic::Config::Value *Pic::Config::findValue(const QString &mask, const QString &value) const
+const Pic::Config::Value *Pic::Config::findValue(const TQString &tqmask, const TQString &value) const
 {
-  const Mask *cmask = findMask(mask);
-  if ( cmask==0 ) return 0;
-  for (uint i=0; i<uint(cmask->values.count()); i++)
-    if ( cmask->values[i].name==value ) return &cmask->values[i];
+  const Mask *ctqmask = findMask(tqmask);
+  if ( ctqmask==0 ) return 0;
+  for (uint i=0; i<uint(ctqmask->values.count()); i++)
+    if ( ctqmask->values[i].name==value ) return &ctqmask->values[i];
   return 0;
 }
 
-bool Pic::Config::checkValueName(const QString &mask, const QString &name) const
+bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) const
 {
-  const Data &data = DATA[masks()[mask].index];
-  QString pinRegexp = "[A-Z]+\\d*(/[A-Z]+\\d*)?";
+  const Data &data = DATA[tqmasks()[tqmask].index];
+  TQString pinRegexp = "[A-Z]+\\d*(/[A-Z]+\\d*)?";
   switch (data.type) {
     case Fixed: break;
     case ValueDouble: {
@@ -349,7 +349,7 @@ bool Pic::Config::checkValueName(const QString &mask, const QString &name) const
       break;
     }
     case Ratio: {
-      QRegExp regexp("(\\d+):(\\d+)");
+      TQRegExp regexp("(\\d+):(\\d+)");
       if ( regexp.exactMatch(name) ) {
         bool ok1, ok2;
         (void)regexp.cap(1).toUInt(&ok1);
@@ -359,17 +359,17 @@ bool Pic::Config::checkValueName(const QString &mask, const QString &name) const
       break;
     }
     case MemoryRange:
-      return _protection.checkRange(mask, name);
+      return _protection.checkRange(tqmask, name);
     case Toggle:
       if ( name=="On" || name=="Off" ) return true;
       break;
     case Pin: {
-      QRegExp regexp(pinRegexp);
+      TQRegExp regexp(pinRegexp);
       if ( regexp.exactMatch(name) ) return true;
       break;
     }
     case Pins: {
-      QRegExp regexp(pinRegexp + "(, " + pinRegexp + ")+");
+      TQRegExp regexp(pinRegexp + "(, " + pinRegexp + ")+");
       if ( regexp.exactMatch(name) ) return true;
       break;
     }
@@ -379,9 +379,9 @@ bool Pic::Config::checkValueName(const QString &mask, const QString &name) const
   return false;
 }
 
-QString Pic::Config::valueLabel(const QString &mask, const QString &name)
+TQString Pic::Config::valueLabel(const TQString &tqmask, const TQString &name)
 {
-  const Data &data = DATA[masks()[mask].index];
+  const Data &data = DATA[tqmasks()[tqmask].index];
   switch (data.type) {
     case Fixed:
     case ValueDouble:
@@ -405,51 +405,51 @@ QString Pic::Config::valueLabel(const QString &mask, const QString &name)
 
 BitValue Pic::Config::Word::usedMask() const
 {
-  BitValue mask = 0x0;
-  for (uint i=0; i<uint(masks.count()); i++) mask |= masks[i].value;
-  return mask;
+  BitValue tqmask = 0x0;
+  for (uint i=0; i<uint(tqmasks.count()); i++) tqmask |= tqmasks[i].value;
+  return tqmask;
 }
 
 //-----------------------------------------------------------------------------
-QDataStream &Pic::operator <<(QDataStream &s, const Config::Value &value)
+TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Value &value)
 {
   s << value.name << value.configNames << value.value;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, Config::Value &value)
+TQDataStream &Pic::operator >>(TQDataStream &s, Config::Value &value)
 {
   s >> value.name >> value.configNames >> value.value;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const Config::Mask &mask)
+TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Mask &tqmask)
 {
-  s << mask.name << mask.value << mask.values;
+  s << tqmask.name << tqmask.value << tqmask.values;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, Config::Mask &mask)
+TQDataStream &Pic::operator >>(TQDataStream &s, Config::Mask &tqmask)
 {
-  s >> mask.name >> mask.value >> mask.values;
+  s >> tqmask.name >> tqmask.value >> tqmask.values;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const Config::Word &word)
+TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Word &word)
 {
-  s << word.name << word.ignoredCNames << word.wmask << word.pmask << word.cmask << word.bvalue << word.masks;
+  s << word.name << word.ignoredCNames << word.wtqmask << word.ptqmask << word.ctqmask << word.bvalue << word.tqmasks;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, Config::Word &word)
+TQDataStream &Pic::operator >>(TQDataStream &s, Config::Word &word)
 {
-  s >> word.name >> word.ignoredCNames >> word.wmask >> word.pmask >> word.cmask >> word.bvalue >> word.masks;
+  s >> word.name >> word.ignoredCNames >> word.wtqmask >> word.ptqmask >> word.ctqmask >> word.bvalue >> word.tqmasks;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const Config &config)
+TQDataStream &Pic::operator <<(TQDataStream &s, const Config &config)
 {
   s << config._words;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, Config &config)
+TQDataStream &Pic::operator >>(TQDataStream &s, Config &config)
 {
   s >> config._words;
   return s;
diff --git a/src/devices/pic/base/pic_config.h b/src/devices/pic/base/pic_config.h
index 185a19e..67c0b1c 100644
--- a/src/devices/pic/base/pic_config.h
+++ b/src/devices/pic/base/pic_config.h
@@ -9,8 +9,8 @@
 #ifndef PIC_CONFIG_H
 #define PIC_CONFIG_H
 
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
 
 #include "common/common/bitvalue.h"
 #include "pic_protection.h"
@@ -29,8 +29,8 @@ class Config
 public:
   class Value {
   public:
-    QString name;
-    QMap<ConfigNameType, QStringList> configNames;
+    TQString name;
+    TQMap<ConfigNameType, TQStringList> configNames;
     BitValue value;
     bool operator <(const Value &cv) const { return value<cv.value; }
     bool isValid() const { return !name.isEmpty(); }
@@ -38,33 +38,33 @@ public:
 
   class Mask {
   public:
-    QString name;
+    TQString name;
     BitValue value;
-    QValueVector<Value> values; // ordered from lower to higher
+    TQValueVector<Value> values; // ordered from lower to higher
     bool operator <(const Mask &cm) const { return value<cm.value; }
   };
 
   class Word {
   public:
-    QString name;
-    QStringList ignoredCNames;
-    BitValue wmask, pmask, cmask; // write, protected, and checksum bits masks
+    TQString name;
+    TQStringList ignoredCNames;
+    BitValue wtqmask, ptqmask, ctqmask; // write, protected, and checksum bits tqmasks
     BitValue bvalue;              // blank value
-    QValueVector<Mask> masks; // ordered from lower to higher
+    TQValueVector<Mask> tqmasks; // ordered from lower to higher
     BitValue usedMask() const;
   };
 
 public:
   Config(const Pic::Data &data) : _data(data), _protection(data, *this) {}
-  QValueVector<Word> _words;
+  TQValueVector<Word> _words;
   const Protection &protection() const { return _protection; }
 
-  const Value *findValue(const QString &mask, const QString &value) const;
-  const Mask *findMask(const QString &mask, uint *wordIndex = 0) const;
-  static bool hasMaskName(const QString &mask);
-  static QString maskLabel(const QString &mask);
-  bool checkValueName(const QString &mask, const QString &name) const;
-  static QString valueLabel(const QString &mask, const QString &name);
+  const Value *findValue(const TQString &tqmask, const TQString &value) const;
+  const Mask *findMask(const TQString &tqmask, uint *wordIndex = 0) const;
+  static bool hasMaskName(const TQString &tqmask);
+  static TQString tqmaskLabel(const TQString &tqmask);
+  bool checkValueName(const TQString &tqmask, const TQString &name) const;
+  static TQString valueLabel(const TQString &tqmask, const TQString &name);
 
 private:
   class MapData {
@@ -73,8 +73,8 @@ private:
     MapData(int i, int b) : index(i), block(b) {}
     int index, block;
   };
-  static QMap<QString, MapData> &masks();
-  static QMap<QString, MapData> *_masks; // mask name -> index in DATA
+  static TQMap<TQString, MapData> &tqmasks();
+  static TQMap<TQString, MapData> *_tqmasks; // tqmask name -> index in DATA
 
   struct NameData {
     const char *name, *label;
@@ -82,7 +82,7 @@ private:
   enum Type { Fixed, ValueDouble, ValueUInt, Ratio, MemoryRange, Toggle, Pin, Pins };
   class Data {
   public:
-    const NameData mask;
+    const NameData tqmask;
     Type type;
     const NameData values[50];
   };
@@ -93,14 +93,14 @@ private:
   Protection _protection;
 };
 
-QDataStream &operator <<(QDataStream &s, const Config::Value &value);
-QDataStream &operator >>(QDataStream &s, Config::Value &value);
-QDataStream &operator <<(QDataStream &s, const Config::Mask &mask);
-QDataStream &operator >>(QDataStream &s, Config::Mask &mask);
-QDataStream &operator <<(QDataStream &s, const Config::Word &word);
-QDataStream &operator >>(QDataStream &s, Config::Word &word);
-QDataStream &operator <<(QDataStream &s, const Config &config);
-QDataStream &operator >>(QDataStream &s, Config &config);
+TQDataStream &operator <<(TQDataStream &s, const Config::Value &value);
+TQDataStream &operator >>(TQDataStream &s, Config::Value &value);
+TQDataStream &operator <<(TQDataStream &s, const Config::Mask &tqmask);
+TQDataStream &operator >>(TQDataStream &s, Config::Mask &tqmask);
+TQDataStream &operator <<(TQDataStream &s, const Config::Word &word);
+TQDataStream &operator >>(TQDataStream &s, Config::Word &word);
+TQDataStream &operator <<(TQDataStream &s, const Config &config);
+TQDataStream &operator >>(TQDataStream &s, Config &config);
 
 } //namespace
 
diff --git a/src/devices/pic/base/pic_protection.cpp b/src/devices/pic/base/pic_protection.cpp
index da77881..7af925c 100644
--- a/src/devices/pic/base/pic_protection.cpp
+++ b/src/devices/pic/base/pic_protection.cpp
@@ -10,16 +10,16 @@
 
 #include "pic_config.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
-bool Pic::Protection::isNoneProtectedValueName(const QString &name) const
+bool Pic::Protection::isNoneProtectedValueName(const TQString &name) const
 {
   if ( name=="Off" ) return true;
   if ( _data.architecture()==Architecture::P17C ) return !isAllProtectedValueName(name);
   return false;
 }
 
-bool Pic::Protection::isAllProtectedValueName(const QString &name) const
+bool Pic::Protection::isAllProtectedValueName(const TQString &name) const
 {
   if ( name=="All" ) return true;
   if ( _data.architecture()==Architecture::P17C ) return ( name=="Code-protected microcontroller" );
@@ -29,13 +29,13 @@ bool Pic::Protection::isAllProtectedValueName(const QString &name) const
 Pic::Protection::Family Pic::Protection::family() const
 {
   if ( _config.findMask("WRTBS") ) return CodeGuard;
-  QString mask = maskName(ProgramProtected, MemoryRangeType::Code);
-  if ( _config.findMask(QString("%1_%2").arg(mask).arg(0)) ) return BlockProtection;
-  if ( _config.findMask(mask) ) return BasicProtection;
+  TQString tqmask = tqmaskName(ProgramProtected, MemoryRangeType::Code);
+  if ( _config.findMask(TQString("%1_%2").tqarg(tqmask).tqarg(0)) ) return BlockProtection;
+  if ( _config.findMask(tqmask) ) return BasicProtection;
   return NoProtection;
 }
 
-QString Pic::Protection::securityValueName(Type type) const
+TQString Pic::Protection::securityValueName(Type type) const
 {
   if ( type==StandardSecurity ) return "Standard Security";
   if ( type==HighSecurity ) return "High Security";
@@ -43,12 +43,12 @@ QString Pic::Protection::securityValueName(Type type) const
   return "Off";
 }
 
-QString Pic::Protection::bootSizeMaskName() const
+TQString Pic::Protection::bootSizeMaskName() const
 {
   return (family()==CodeGuard ? "BSSIZ" : "BBSIZ");
 }
 
-QString Pic::Protection::bootMaskName(Type type) const
+TQString Pic::Protection::bootMaskName(Type type) const
 {
   Q_ASSERT( type!=Nb_Types );
   if ( family()==CodeGuard ) {
@@ -59,10 +59,10 @@ QString Pic::Protection::bootMaskName(Type type) const
     if ( type==WriteProtected ) return "WRTB";
     if ( type==ReadProtected ) return "EBTRB";
   }
-  return QString::null;
+  return TQString();
 }
 
-QString Pic::Protection::blockSizeMaskName(uint block) const
+TQString Pic::Protection::blockSizeMaskName(uint block) const
 {
   if ( family()==CodeGuard ) {
     Q_ASSERT( block==0 );
@@ -71,18 +71,18 @@ QString Pic::Protection::blockSizeMaskName(uint block) const
   return blockMaskName(ProgramProtected, block);
 }
 
-QString Pic::Protection::blockMaskName(Type type, uint block) const
+TQString Pic::Protection::blockMaskName(Type type, uint block) const
 {
   Q_ASSERT( type!=Nb_Types );
   if ( family()==CodeGuard ) {
     if ( type==WriteProtected ) return (block==0 ? "WRTSS" : "WRTGS");
     if ( type==StandardSecurity || type==HighSecurity ) return (block==0 ? "SSSEC" : "GSSEC");
-    return QString::null;
+    return TQString();
   }
-  return QString("%1_%2").arg(maskName(type, MemoryRangeType::Code)).arg(block);
+  return TQString("%1_%2").tqarg(tqmaskName(type, MemoryRangeType::Code)).tqarg(block);
 }
 
-QString Pic::Protection::maskName(Type type, MemoryRangeType mtype) const
+TQString Pic::Protection::tqmaskName(Type type, MemoryRangeType mtype) const
 {
   Q_ASSERT( type!=Nb_Types );
   switch (mtype.type()) {
@@ -112,13 +112,13 @@ QString Pic::Protection::maskName(Type type, MemoryRangeType mtype) const
     case MemoryRangeType::Nb_Types: Q_ASSERT(false); break;
     default: break;
   }
-  return QString::null;
+  return TQString();
 }
 
-bool Pic::Protection::extractRanges(const QString &name, QValueVector<Address> &starts, Address &end, bool &ok)
+bool Pic::Protection::extractRanges(const TQString &name, TQValueVector<Address> &starts, Address &end, bool &ok)
 {
   ok = false;
-  QRegExp regexp("([A-F0-9]+)(/[A-F0-9]+)?(/[A-F0-9]+)?:([A-F0-9]+)");
+  TQRegExp regexp("([A-F0-9]+)(/[A-F0-9]+)?(/[A-F0-9]+)?:([A-F0-9]+)");
   if ( !regexp.exactMatch(name) ) return false;
   bool ok1;
   end = fromHex(regexp.cap(regexp.numCaptures()), &ok1);
@@ -130,7 +130,7 @@ bool Pic::Protection::extractRanges(const QString &name, QValueVector<Address> &
   for (int i=1; i<regexp.numCaptures(); i++) {
     if ( regexp.cap(i).isEmpty() ) break;
     bool ok1;
-    QString s = (i==1 ? regexp.cap(i) : regexp.cap(i).mid(1));
+    TQString s = (i==1 ? regexp.cap(i) : regexp.cap(i).mid(1));
     Address start = fromHex(s, &ok1);
     if ( !ok1 ) {
       qDebug("Malformed start address %s", s.latin1());
@@ -146,7 +146,7 @@ bool Pic::Protection::extractRanges(const QString &name, QValueVector<Address> &
   return true;
 }
 
-AddressRangeVector Pic::Protection::extractRanges(const QString &name, MemoryRangeType type) const
+AddressRangeVector Pic::Protection::extractRanges(const TQString &name, MemoryRangeType type) const
 {
   if ( isNoneProtectedValueName(name) ) return AddressRange();
   if ( isAllProtectedValueName(name) ) {
@@ -154,7 +154,7 @@ AddressRangeVector Pic::Protection::extractRanges(const QString &name, MemoryRan
     return AddressRange(rdata.start, rdata.end);
   }
   bool ok1;
-  QValueVector<Address> starts;
+  TQValueVector<Address> starts;
   Address end;
   bool ok2 = extractRanges(name, starts, end, ok1);
   Q_ASSERT(ok1);
@@ -165,11 +165,11 @@ AddressRangeVector Pic::Protection::extractRanges(const QString &name, MemoryRan
   return rv;
 }
 
-bool Pic::Protection::checkRange(const QString &mask, const QString &name) const
+bool Pic::Protection::checkRange(const TQString &tqmask, const TQString &name) const
 {
   if ( family()!=CodeGuard ) {
     bool ok;
-    (void)extractRange(mask, name, ok);
+    (void)extractRange(tqmask, name, ok);
     return ok;
   }
 
@@ -180,8 +180,8 @@ bool Pic::Protection::checkRange(const QString &mask, const QString &name) const
     isBootBlock = ( i==0 );
     block = i - 1;
     for (uint k=0; k<Nb_Types; k++) {
-      QString mname = (isBootBlock ? bootMaskName(Type(k)) : blockMaskName(Type(k), block));
-      if ( mask!=mname ) continue;
+      TQString mname = (isBootBlock ? bootMaskName(Type(k)) : blockMaskName(Type(k), block));
+      if ( tqmask!=mname ) continue;
       ptype = Type(k);
       break;
     }
@@ -195,15 +195,15 @@ bool Pic::Protection::checkRange(const QString &mask, const QString &name) const
   return true;
 }
 
-Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mask, const QString &name, bool &ok) const
+Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tqmask, const TQString &name, bool &ok) const
 {
   Q_ASSERT( family()!=CodeGuard );
-  //qDebug("extract range %s %s", mask.latin1(), name.latin1());
+  //qDebug("extract range %s %s", tqmask.latin1(), name.latin1());
   ProtectedRange pr;
   ok = false;
 
-  QRegExp rexp("([A-Z]+)(?:_([0-9])|)");
-  if ( !rexp.exactMatch(mask) ) {
+  TQRegExp rexp("([A-Z]+)(?:_([0-9])|)");
+  if ( !rexp.exactMatch(tqmask) ) {
     qDebug("Malformed block range");
     return pr;
   }
@@ -215,7 +215,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mas
   for (MemoryRangeType type; type<=MemoryRangeType::Nb_Types; ++type) { // #### danger: <=
     isBootBlock = ( type==MemoryRangeType::Nb_Types );
     for (uint k=0; k<Nb_Types; k++) {
-      QString mname = (isBootBlock ? bootMaskName(Type(k)) : maskName(Type(k), type));
+      TQString mname = (isBootBlock ? bootMaskName(Type(k)) : tqmaskName(Type(k), type));
       if ( rexp.cap(1)!=mname ) continue;
       rtype = (isBootBlock ? MemoryRangeType(MemoryRangeType::Code) : type);
       ptype = Type(k);
@@ -239,24 +239,24 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mas
     return pr;
   }
 
-  const Config::Mask *bmask = _config.findMask(bootMaskName(ptype));
-  const Config::Mask *bsmask = _config.findMask(bootSizeMaskName());
+  const Config::Mask *btqmask = _config.findMask(bootMaskName(ptype));
+  const Config::Mask *bstqmask = _config.findMask(bootSizeMaskName());
   const MemoryRangeData &rdata = _data.range(rtype);
   if ( isAllProtectedValueName(name) ) {
-    if ( rtype==MemoryRangeType::Code && !isBootBlock && bmask ) {
+    if ( rtype==MemoryRangeType::Code && !isBootBlock && btqmask ) {
       qDebug("Protected range should be explicit with boot block");
       return pr;
     }
     if (isBootBlock) {
-      if ( bsmask==0 ) {
+      if ( bstqmask==0 ) {
         qDebug("Protected range should be explicit when boot size not present");
         return pr;
       }
       Address start = _data.range(MemoryRangeType::Code).start;
       pr.starts.append(start);
-      for (uint k=0; k<uint(bsmask->values.count()); k++) {
+      for (uint k=0; k<uint(bstqmask->values.count()); k++) {
         bool ok1;
-        uint size = bsmask->values[k].name.toUInt(&ok1);
+        uint size = bstqmask->values[k].name.toUInt(&ok1);
         if ( !ok1 ) {
           qDebug("Could not recognize boot size value");
           return pr;
@@ -277,7 +277,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mas
     ok = true;
     return pr;
   }
-  if ( isBootBlock && bsmask ) {
+  if ( isBootBlock && bstqmask ) {
     qDebug("Protected range should not be explicit when boot size is present");
     return pr;
   }
@@ -294,7 +294,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mas
     qDebug("End is beyond memory range");
     return pr;
   }
-  if ( (rtype!=MemoryRangeType::Code || isBootBlock) && (pr.starts.count()>1 || !rexp.cap(2).isEmpty() || bmask==0)  ) {
+  if ( (rtype!=MemoryRangeType::Code || isBootBlock) && (pr.starts.count()>1 || !rexp.cap(2).isEmpty() || btqmask==0)  ) {
     qDebug("Only code with blocks and boot can have multiple protected ranges");
     return pr;
   }
@@ -306,14 +306,14 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const QString &mas
 
   // check with boot block
   if ( pr.starts.count()>1 ) {
-    if ( bmask==0 ) {
-      qDebug("No boot mask");
+    if ( btqmask==0 ) {
+      qDebug("No boot tqmask");
       return pr;
     }
-    for (uint i=0; i<uint(bmask->values.count()); i++) {
-      if ( bmask->values[i].name=="Off" ) continue;
+    for (uint i=0; i<uint(btqmask->values.count()); i++) {
+      if ( btqmask->values[i].name=="Off" ) continue;
       bool ok1;
-      ProtectedRange bpr = extractRange(bmask->name, bmask->values[i].name, ok1);
+      ProtectedRange bpr = extractRange(btqmask->name, btqmask->values[i].name, ok1);
       if ( !ok1 ) return pr;
       if ( bpr.ends.count()!=pr.starts.count() ) {
         qDebug("Boot number of ends (%i) should be the same as code number of starts (%i)", int(bpr.ends.count()), int(pr.starts.count()));
@@ -341,21 +341,21 @@ uint Pic::Protection::nbBlocks() const
 {
   if ( family()==CodeGuard ) return 2; // codeguard : secure segment + general segment
   for (uint i=0; i<MAX_NB_BLOCKS; i++)
-    if ( _config.findMask(QString("CP_%1").arg(i))==0 ) return i;
+    if ( _config.findMask(TQString("CP_%1").tqarg(i))==0 ) return i;
   return MAX_NB_BLOCKS;
 }
 
-QString Pic::Protection::bootLabel() const
+TQString Pic::Protection::bootLabel() const
 {
   if ( family()==CodeGuard ) return i18n("Boot Segment");
   return i18n("Boot Block");
 }
 
-QString Pic::Protection::blockLabel(uint i) const
+TQString Pic::Protection::blockLabel(uint i) const
 {
   if ( family()==CodeGuard ) {
     if ( i==0 ) return i18n("Secure Segment");
     return i18n("General Segment");
   }
-  return i18n("Block #%1").arg(i);
+  return i18n("Block #%1").tqarg(i);
 }
diff --git a/src/devices/pic/base/pic_protection.h b/src/devices/pic/base/pic_protection.h
index 67ff667..a10a8a6 100644
--- a/src/devices/pic/base/pic_protection.h
+++ b/src/devices/pic/base/pic_protection.h
@@ -27,32 +27,32 @@ public:
 public:
   Protection(const Pic::Data &data, const Config &config) : _data(data), _config(config) {}
   Family family() const;
-  QString securityValueName(Type type) const;
+  TQString securityValueName(Type type) const;
   bool hasBootBlock() const;
-  QString bootSizeMaskName() const;
-  QString bootMaskName(Type ptype) const;
-  QString bootLabel() const;
+  TQString bootSizeMaskName() const;
+  TQString bootMaskName(Type ptype) const;
+  TQString bootLabel() const;
   uint nbBlocks() const;
-  QString blockSizeMaskName(uint i) const;
-  QString blockMaskName(Type ptype, uint i) const;
-  QString blockLabel(uint i) const;
-  AddressRangeVector extractRanges(const QString &name, MemoryRangeType type) const;
-  bool checkRange(const QString &mask, const QString &name) const;
-  QString maskName(Type type, MemoryRangeType mtype) const;
-  bool isAllProtectedValueName(const QString &valueName) const;
-  bool isNoneProtectedValueName(const QString &valueName) const;
+  TQString blockSizeMaskName(uint i) const;
+  TQString blockMaskName(Type ptype, uint i) const;
+  TQString blockLabel(uint i) const;
+  AddressRangeVector extractRanges(const TQString &name, MemoryRangeType type) const;
+  bool checkRange(const TQString &tqmask, const TQString &name) const;
+  TQString tqmaskName(Type type, MemoryRangeType mtype) const;
+  bool isAllProtectedValueName(const TQString &valueName) const;
+  bool isNoneProtectedValueName(const TQString &valueName) const;
 
 private:
   const Pic::Data &_data;
   const Config    &_config;
 
   enum SegmentType { BootSegment = 0, SecureSegment, GeneralSegment, Nb_SegmentTypes };
-  static bool extractRanges(const QString &name, QValueVector<Address> &starts, Address &end, bool &ok);
+  static bool extractRanges(const TQString &name, TQValueVector<Address> &starts, Address &end, bool &ok);
   class ProtectedRange {
   public:
-    QValueVector<Address> starts, ends;
+    TQValueVector<Address> starts, ends;
   };
-  ProtectedRange extractRange(const QString &mask, const QString &name, bool &ok) const;
+  ProtectedRange extractRange(const TQString &tqmask, const TQString &name, bool &ok) const;
 };
 
 } //namespace
diff --git a/src/devices/pic/base/pic_register.cpp b/src/devices/pic/base/pic_register.cpp
index fcfe5ef..b5dc616 100644
--- a/src/devices/pic/base/pic_register.cpp
+++ b/src/devices/pic/base/pic_register.cpp
@@ -28,7 +28,7 @@ Address Pic::RegistersData::mirroredAddress(Address address) const
     }
     if ( delta==-1 ) continue;
     for (uint k=0; k<uint(mirrored[i].count()); k++)
-      mirror = QMIN(mirrored[i][k].start + delta, mirror);
+      mirror = TQMIN(mirrored[i][k].start + delta, mirror);
     break;
   }
   return mirror;
@@ -43,7 +43,7 @@ Device::RegisterProperties Pic::RegistersData::properties(Address address) const
     case Sfr: {
       Device::RegisterProperties properties = Device::NotAccessible;
       RegisterBitProperties rbp = RegisterBitUnused;
-      QMap<QString, RegisterData>::const_iterator it;
+      TQMap<TQString, RegisterData>::const_iterator it;
       for (it=sfrs.begin(); it!=sfrs.end(); ++it) {
         if ( it.data().address!=address ) continue;
         for (uint i=0; i<Device::MAX_NB_PORT_BITS; i++) rbp |= it.data().bits[i].properties;
@@ -69,29 +69,29 @@ Pic::RegisterType Pic::RegistersData::type(Address address) const
   return Mirrored;
 }
 
-QString Pic::RegistersData::label(Address address) const
+TQString Pic::RegistersData::label(Address address) const
 {
   switch ( type(address) ) {
     case UnusedRegister: return "---";
-    case Mirrored: return i18n("Mirror of %1").arg(toHexLabel(mirroredAddress(address), nbCharsAddress()));
+    case Mirrored: return i18n("Mirror of %1").tqarg(toHexLabel(mirroredAddress(address), nbCharsAddress()));
     case Gpr: return "<GPR>";
     case Sfr: return sfrNames[address];
   }
   Q_ASSERT(false);
-  return QString::null;
+  return TQString();
 }
 
 bool Pic::RegistersData::hasPort(uint index) const
 {
   Q_ASSERT( index<Device::MAX_NB_PORTS );
-  if ( sfrs.contains("GPIO") ) return ( index==0 );
-  if ( !sfrs.contains(portName(index)) ) return false;
+  if ( sfrs.tqcontains("GPIO") ) return ( index==0 );
+  if ( !sfrs.tqcontains(portName(index)) ) return false;
   return true;
 }
 
 int Pic::RegistersData::portIndex(Address address) const
 {
-  QString name = sfrNames[address];
+  TQString name = sfrNames[address];
   if ( name.isEmpty() ) return -1;
   for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
     if ( !hasPort(i) ) continue;
@@ -107,58 +107,58 @@ bool Pic::RegistersData::hasPortBit(uint index, uint bit) const
   return ( port.bits[bit].properties!=RegisterBitUnused );
 }
 
-QString Pic::RegistersData::portName(uint index) const
+TQString Pic::RegistersData::portName(uint index) const
 {
-  if ( sfrs.contains("GPIO") ) {
-    if ( index!=0 ) return QString::null;
+  if ( sfrs.tqcontains("GPIO") ) {
+    if ( index!=0 ) return TQString();
     return "GPIO";
   }
-  return QString("PORT") + char('A' + index);
+  return TQString("PORT") + char('A' + index);
 }
 
-QString Pic::RegistersData::trisName(uint index) const
+TQString Pic::RegistersData::trisName(uint index) const
 {
-  if ( sfrs.contains("GPIO") ) {
-    if ( index!=0 ) return QString::null;
+  if ( sfrs.tqcontains("GPIO") ) {
+    if ( index!=0 ) return TQString();
     return "TRISIO";
   }
   if ( _data.architecture()==Architecture::P17C ) {
-    if ( index==0 ) return QString::null;
-    return QString("DDR") + char('A' + index);
+    if ( index==0 ) return TQString();
+    return TQString("DDR") + char('A' + index);
   }
-  return QString("TRIS") + char('A' + index);
+  return TQString("TRIS") + char('A' + index);
 }
 
 bool Pic::RegistersData::hasTris(uint index) const
 {
-  QString name = trisName(index);
+  TQString name = trisName(index);
   if ( name.isEmpty() ) return false;
-  return sfrs.contains(name);
+  return sfrs.tqcontains(name);
 }
 
-QString Pic::RegistersData::latchName(uint index) const
+TQString Pic::RegistersData::latchName(uint index) const
 {
   if ( _data.architecture()==Architecture::P10X || _data.architecture()==Architecture::P16X || _data.architecture()==Architecture::P17C )
-    return QString::null;
-  return QString("LAT") + char('A' + index);
+    return TQString();
+  return TQString("LAT") + char('A' + index);
 }
 
 bool Pic::RegistersData::hasLatch(uint index) const
 {
-  QString name = latchName(index);
+  TQString name = latchName(index);
   if ( name.isEmpty() ) return false;
-  return sfrs.contains(name);
+  return sfrs.tqcontains(name);
 }
 
-QString Pic::RegistersData::portBitName(uint index, uint bit) const
+TQString Pic::RegistersData::portBitName(uint index, uint bit) const
 {
-  if ( sfrs.contains("GPIO") ) return QString("GP") + QString::number(bit);
-  return QString("R") + char('A' + index) + QString::number(bit);
+  if ( sfrs.tqcontains("GPIO") ) return TQString("GP") + TQString::number(bit);
+  return TQString("R") + char('A' + index) + TQString::number(bit);
 }
 
-QValueList<Register::TypeData> Pic::RegistersData::relatedRegisters(const Register::TypeData &data) const
+TQValueList<Register::TypeData> Pic::RegistersData::relatedRegisters(const Register::TypeData &data) const
 {
-  QValueList<Register::TypeData> list;
+  TQValueList<Register::TypeData> list;
   if ( data.type()==Register::Regular ) {
     int i = portIndex(data.address());
     if ( i==-1 ) list.append(data);
@@ -185,7 +185,7 @@ bool Pic::RegistersData::bankHasSfrs(uint i) const
   if ( i==0 ) return true;
   if ( (_data.architecture()==Pic::Architecture::P18F || _data.architecture()==Pic::Architecture::P18J) && i==15 ) return true;
   if ( !isBankUsed(i) ) return false;
-  QMap<Address, QString>::const_iterator it;
+  TQMap<Address, TQString>::const_iterator it;
   for (it=sfrNames.begin(); it!=sfrNames.end(); ++it)
     if ( bankFromAddress(it.key())==i ) return true;
   return false;
@@ -220,25 +220,25 @@ uint Pic::RegistersData::firstGprIndex() const
 }
 
 //----------------------------------------------------------------------------
-QDataStream &Pic::operator <<(QDataStream &s, const RangeData &rd)
+TQDataStream &Pic::operator <<(TQDataStream &s, const RangeData &rd)
 {
   s << rd.start << rd.length;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, RangeData &rd)
+TQDataStream &Pic::operator >>(TQDataStream &s, RangeData &rd)
 {
   s >> rd.start >> rd.length;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const RegisterBitData &rbd)
+TQDataStream &Pic::operator <<(TQDataStream &s, const RegisterBitData &rbd)
 {
-  s << Q_UINT8(rbd.properties) << Q_UINT8(rbd.por) << Q_UINT8(rbd.mclr);
+  s << TQ_UINT8(rbd.properties) << TQ_UINT8(rbd.por) << TQ_UINT8(rbd.mclr);
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, RegisterBitData &rbd)
+TQDataStream &Pic::operator >>(TQDataStream &s, RegisterBitData &rbd)
 {
-  Q_UINT8 properties, por, mclr;
+  TQ_UINT8 properties, por, mclr;
   s >> properties >> por >> mclr;
   rbd.properties = RegisterBitProperties(properties);
   rbd.por = RegisterBitState(por);
@@ -246,42 +246,42 @@ QDataStream &Pic::operator >>(QDataStream &s, RegisterBitData &rbd)
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const RegisterData &rd)
+TQDataStream &Pic::operator <<(TQDataStream &s, const RegisterData &rd)
 {
   s << rd.address;
   for (int i=0; i<Device::MAX_NB_PORT_BITS; i++) s << rd.bits[i];
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, RegisterData &rd)
+TQDataStream &Pic::operator >>(TQDataStream &s, RegisterData &rd)
 {
   s >> rd.address;
   for (int i=0; i<Device::MAX_NB_PORT_BITS; i++) s >> rd.bits[i];
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const CombinedData &rd)
+TQDataStream &Pic::operator <<(TQDataStream &s, const CombinedData &rd)
 {
   s << rd.address << rd.nbChars;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, CombinedData &rd)
+TQDataStream &Pic::operator >>(TQDataStream &s, CombinedData &rd)
 {
   s >> rd.address >> rd.nbChars;
   return s;
 }
 
-QDataStream &Pic::operator <<(QDataStream &s, const RegistersData &rd)
+TQDataStream &Pic::operator <<(TQDataStream &s, const RegistersData &rd)
 {
   s << rd.nbBanks << rd.accessBankSplit << rd.unusedBankMask;
   s << rd.sfrs << rd.mirrored << rd.unused << rd.combined;
   return s;
 }
-QDataStream &Pic::operator >>(QDataStream &s, RegistersData &rd)
+TQDataStream &Pic::operator >>(TQDataStream &s, RegistersData &rd)
 {
   s >> rd.nbBanks >> rd.accessBankSplit >> rd.unusedBankMask;
   s >> rd.sfrs >> rd.mirrored >> rd.unused >> rd.combined;
   rd.sfrNames.clear();
-  QMap<QString, RegisterData>::const_iterator it;
+  TQMap<TQString, RegisterData>::const_iterator it;
   for(it=rd.sfrs.begin(); it!=rd.sfrs.end(); ++it) rd.sfrNames[it.data().address] = it.key();
   return s;
 }
diff --git a/src/devices/pic/base/pic_register.h b/src/devices/pic/base/pic_register.h
index 41da020..bb12657 100644
--- a/src/devices/pic/base/pic_register.h
+++ b/src/devices/pic/base/pic_register.h
@@ -9,7 +9,7 @@
 #ifndef PIC_REGISTER_H
 #define PIC_REGISTER_H
 
-#include <qmap.h>
+#include <tqmap.h>
 
 #include "devices/base/register.h"
 #include "pic.h"
@@ -29,8 +29,8 @@ enum RegisterBitProperty { RegisterBitUnused = 0x0,
   RegisterBitOnlySoftwareClear = 0x4, RegisterBitOnlySoftwareSet = 0x8,
   MaxRegisterBitProperty = 0x15
 };
-Q_DECLARE_FLAGS(RegisterBitProperties, RegisterBitProperty)
-Q_DECLARE_OPERATORS_FOR_FLAGS(RegisterBitProperties)
+TQ_DECLARE_FLAGS(RegisterBitProperties, RegisterBitProperty)
+TQ_DECLARE_OPERATORS_FOR_FLAGS(RegisterBitProperties)
 enum RegisterBitState { RegisterBitUnknown = 0, RegisterBitLow, RegisterBitHigh,
   RegisterBitUnchanged, RegisterBitDepends, RegisterBitDependsConfig, Nb_RegisterBitStates
 };
@@ -72,26 +72,26 @@ public:
   uint firstGprIndex() const; // in first bank
 
   uint nbBanks, accessBankSplit, unusedBankMask;
-  QMap<QString, RegisterData> sfrs;
-  QMap<Address, QString> sfrNames; // address -> name
-  QValueVector<QValueVector<RangeData> > mirrored;
-  QValueVector<RangeData> unused;
-  QMap<QString, CombinedData> combined;
+  TQMap<TQString, RegisterData> sfrs;
+  TQMap<Address, TQString> sfrNames; // address -> name
+  TQValueVector<TQValueVector<RangeData> > mirrored;
+  TQValueVector<RangeData> unused;
+  TQMap<TQString, CombinedData> combined;
 
   virtual Device::RegisterProperties properties(Address address) const;
   RegisterType type(Address address) const;
-  QString label(Address address) const;
-  virtual QValueList<Register::TypeData> relatedRegisters(const Register::TypeData &data) const;
+  TQString label(Address address) const;
+  virtual TQValueList<Register::TypeData> relatedRegisters(const Register::TypeData &data) const;
 
   virtual bool hasPort(uint index) const;
   virtual int portIndex(Address address) const;
-  virtual QString portName(uint index) const;
+  virtual TQString portName(uint index) const;
   bool hasTris(uint index) const;
-  QString trisName(uint index) const;
+  TQString trisName(uint index) const;
   bool hasLatch(uint index) const;
-  QString latchName(uint index) const;
+  TQString latchName(uint index) const;
   virtual bool hasPortBit(uint index, uint bit) const;
-  virtual QString portBitName(uint index, uint bit) const;
+  virtual TQString portBitName(uint index, uint bit) const;
 
 private:
   const Data &_data;
@@ -99,16 +99,16 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-QDataStream &operator <<(QDataStream &s, const RangeData &rd);
-QDataStream &operator >>(QDataStream &s, RangeData &rd);
-QDataStream &operator <<(QDataStream &s, const RegisterBitData &rbd);
-QDataStream &operator >>(QDataStream &s, RegisterBitData &rbd);
-QDataStream &operator <<(QDataStream &s, const RegisterData &rd);
-QDataStream &operator >>(QDataStream &s, RegisterData &rd);
-QDataStream &operator <<(QDataStream &s, const CombinedData &rd);
-QDataStream &operator >>(QDataStream &s, CombinedData &rd);
-QDataStream &operator <<(QDataStream &s, const RegistersData &rd);
-QDataStream &operator >>(QDataStream &s, RegistersData &rd);
+TQDataStream &operator <<(TQDataStream &s, const RangeData &rd);
+TQDataStream &operator >>(TQDataStream &s, RangeData &rd);
+TQDataStream &operator <<(TQDataStream &s, const RegisterBitData &rbd);
+TQDataStream &operator >>(TQDataStream &s, RegisterBitData &rbd);
+TQDataStream &operator <<(TQDataStream &s, const RegisterData &rd);
+TQDataStream &operator >>(TQDataStream &s, RegisterData &rd);
+TQDataStream &operator <<(TQDataStream &s, const CombinedData &rd);
+TQDataStream &operator >>(TQDataStream &s, CombinedData &rd);
+TQDataStream &operator <<(TQDataStream &s, const RegistersData &rd);
+TQDataStream &operator >>(TQDataStream &s, RegistersData &rd);
 
 } // namespace
 
diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 1812bbf..5cbb5b1 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -8,20 +8,20 @@
  ***************************************************************************/
 #include "pic_config_editor.h"
 
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qapplication.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqapplication.h>
 
 #include "pic_config_word_editor.h"
 #include "common/common/misc.h"
 #include "common/gui/misc_gui.h"
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, QWidget *parent)
-  : Device::MemoryEditorGroup(&memory, parent, "pic_config_editor_widget"),
+Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent)
+  : Device::MemoryEditorGroup(&memory, tqparent, "pic_config_editor_widget"),
     MemoryCaster(MemoryRangeType::Config, memory)
 {
-  QHBoxLayout *hb = new QHBoxLayout(_top);
+  TQHBoxLayout *hb = new TQHBoxLayout(_top);
 
   TabWidget *tabw = 0;
   uint nbWords = device().nbWords(MemoryRangeType::Config);
@@ -34,18 +34,18 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
   for(uint i=0; i<nbWords; ++i) {
     //qDebug("BinWordsEditor for config word #%i", i);
     //uint address = device().range(Device::MemoryConfig).start + device().addressIncrement(Device::MemoryConfig) * i;
-    //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).masks.count());
-    if ( device().config()._words[i].masks.count()==0 ) continue;
-    QWidget *page = 0;
+    //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).tqmasks.count());
+    if ( device().config()._words[i].tqmasks.count()==0 ) continue;
+    TQWidget *page = 0;
     if ( nbWords>1 ) {
-      page = new QWidget(tabw);
+      page = new TQWidget(tabw);
       tabw->addTab(page, device().config()._words[i].name);
     } else {
-      page = new QGroupBox(this);
+      page = new TQGroupBox(this);
       hb->addWidget(page);
     }
-    QVBoxLayout *vbox = new QVBoxLayout(page, 10, 10);
-    QHBoxLayout *hbox = new QHBoxLayout(vbox);
+    TQVBoxLayout *vbox = new TQVBoxLayout(page, 10, 10);
+    TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
     ConfigWordEditor *we = new ConfigWordEditor(memory, i, withWordEditor, page);
     addEditor(we);
     hbox->addWidget(we);
@@ -55,8 +55,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
 }
 
 //----------------------------------------------------------------------------
-Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, QWidget *parent)
-  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, parent, "pic_config_editor")
+Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
+  : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, tqparent, "pic_config_editor")
 {}
 
 void Pic::MemoryConfigEditor::init(bool first)
diff --git a/src/devices/pic/gui/pic_config_editor.h b/src/devices/pic/gui/pic_config_editor.h
index 888debf..d8072ca 100644
--- a/src/devices/pic/gui/pic_config_editor.h
+++ b/src/devices/pic/gui/pic_config_editor.h
@@ -19,16 +19,18 @@ class HexView;
 class MemoryConfigEditorWidget : public Device::MemoryEditorGroup, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, QWidget *parent);
+  MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent);
 };
 
 //----------------------------------------------------------------------------
 class MemoryConfigEditor : public MemoryTypeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryConfigEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 };
 
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index 23e4bce..bfa55e4 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -9,17 +9,17 @@
  ***************************************************************************/
 #include "pic_config_word_editor.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcombobox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcombobox.h>
 #include <klocale.h>
 
 #include "common/common/misc.h"
 #include "common/gui/misc_gui.h"
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordComboBox::ConfigWordComboBox(QWidget *parent)
-  : ComboBox(parent)
+Pic::ConfigWordComboBox::ConfigWordComboBox(TQWidget *tqparent)
+  : ComboBox(tqparent)
 {
   setIgnoreWheelEvent(true);
 }
@@ -38,7 +38,7 @@ void Pic::ConfigWordComboBox::setItem(uint i)
     if ( _map[l]==i ) setCurrentItem(l);
 }
 
-void Pic::ConfigWordComboBox::setInvalidItem(uint i, const QString &label)
+void Pic::ConfigWordComboBox::setInvalidItem(uint i, const TQString &label)
 {
   if ( !isValid() ) changeItem(label, 0);
   else insertItem(label, 0);
@@ -47,98 +47,98 @@ void Pic::ConfigWordComboBox::setInvalidItem(uint i, const QString &label)
 }
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, QWidget *parent)
-  : Dialog(parent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false)
+Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget *tqparent)
+  : Dialog(tqparent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false)
 {
   uint nbChars = memory.device().nbCharsWord(MemoryRangeType::Config);
   const Config::Word &cword = memory.device().config()._words[ci];
 
-  QGridLayout *grid = new QGridLayout(mainWidget(), 0, 0, 10, 10);
+  TQGridLayout *grid = new TQGridLayout(mainWidget(), 0, 0, 10, 10);
   uint row = 0;
-  QLabel *label = new QLabel(i18n("Name:"), mainWidget());
+  TQLabel *label = new TQLabel(i18n("Name:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(cword.name, mainWidget());
+  label = new TQLabel(cword.name, mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Index:"), mainWidget());
+  label = new TQLabel(i18n("Index:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(QString::number(ci), mainWidget());
+  label = new TQLabel(TQString::number(ci), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Raw Value:"), mainWidget());
+  label = new TQLabel(i18n("Raw Value:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(memory.word(MemoryRangeType::Config, ci), nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(memory.word(MemoryRangeType::Config, ci), nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Value:"), mainWidget());
+  label = new TQLabel(i18n("Value:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(memory.normalizedWord(MemoryRangeType::Config, ci), nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(memory.normalizedWord(MemoryRangeType::Config, ci), nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Raw Blank Value:"), mainWidget());
+  label = new TQLabel(i18n("Raw Blank Value:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(cword.bvalue, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.bvalue, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Used Mask:"), mainWidget());
+  label = new TQLabel(i18n("Used Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(cword.usedMask(), nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.usedMask(), nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Write Mask:"), mainWidget());
+  label = new TQLabel(i18n("Write Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(cword.wmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.wtqmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Protected Mask:"), mainWidget());
+  label = new TQLabel(i18n("Protected Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(cword.pmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.ptqmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
-  label = new QLabel(i18n("Checksum Mask:"), mainWidget());
+  label = new TQLabel(i18n("Checksum Mask:"), mainWidget());
   grid->addWidget(label, row, 0);
-  label = new QLabel(toHexLabel(cword.cmask, nbChars), mainWidget());
+  label = new TQLabel(toHexLabel(cword.ctqmask, nbChars), mainWidget());
   grid->addWidget(label, row, 1);
   row++;
 }
 
 //----------------------------------------------------------------------------
-Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, QWidget *parent)
-  : MemoryEditor(MemoryRangeType::Config, memory, parent, "pic_config_word_editor"), _configIndex(ci)
+Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, TQWidget *tqparent)
+  : MemoryEditor(MemoryRangeType::Config, memory, tqparent, "pic_config_word_editor"), _configIndex(ci)
 {
   if (withWordEditor) {
-    QHBoxLayout *hbox = new QHBoxLayout(_top);
+    TQHBoxLayout *hbox = new TQHBoxLayout(_top);
     _mdb = new MemoryRangeEditor(MemoryRangeType::Config, memory, 1, 1, ci, 1, this);
     _mdb->init();
-    connect(_mdb, SIGNAL(modified()), SIGNAL(modified()));
-    connect(_mdb, SIGNAL(modified()), SLOT(updateDisplay()));
+    connect(_mdb, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
+    connect(_mdb, TQT_SIGNAL(modified()), TQT_SLOT(updateDisplay()));
     hbox->addWidget(_mdb);
     KPushButton *button = new KPushButton(i18n("Details..."), this);
-    button->setFixedHeight(button->sizeHint().height());
-    connect(button, SIGNAL(clicked()), SLOT(showDialog()));
+    button->setFixedHeight(button->tqsizeHint().height());
+    connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
     hbox->addWidget(button);
     hbox->addStretch(1);
   } else _mdb = 0;
 
-  QGridLayout *grid = new QGridLayout(_top);
+  TQGridLayout *grid = new TQGridLayout(_top);
   grid->setColStretch(2, 1);
   const Config::Word &cword = device().config()._words[ci];
-  _combos.resize(cword.masks.count());
+  _combos.resize(cword.tqmasks.count());
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &cmask = cword.masks[k];
-    QLabel *label = new QLabel(Config::maskLabel(cmask.name) + ":", this);
+    const Config::Mask &ctqmask = cword.tqmasks[k];
+    TQLabel *label = new TQLabel(Config::tqmaskLabel(ctqmask.name) + ":", this);
     grid->addWidget(label, k, 0);
-    label = new QLabel(cmask.name, this);
+    label = new TQLabel(ctqmask.name, this);
     grid->addWidget(label, k, 1);
     _combos[k] = new ConfigWordComboBox(this);
-    for (uint i=0; i<cmask.values.count(); i++) {
-      if ( !cmask.values[i].isValid() ) continue;
-      QString label = Config::valueLabel(cmask.name, cmask.values[i].name);
-      label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
+    for (uint i=0; i<ctqmask.values.count(); i++) {
+      if ( !ctqmask.values[i].isValid() ) continue;
+      TQString label = Config::valueLabel(ctqmask.name, ctqmask.values[i].name);
+      label += " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")";
       _combos[k]->appendItem(label, i);
     }
-    connect(_combos[k], SIGNAL(activated(int)), SLOT(slotModified()));
+    connect(_combos[k], TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified()));
     grid->addWidget(_combos[k], k, 2);
   }
 }
@@ -148,8 +148,8 @@ void Pic::ConfigWordEditor::setReadOnly(bool readOnly)
   if (_mdb) _mdb->setReadOnly(readOnly);
   const Config::Word &cword = device().config()._words[_configIndex];
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &cmask = cword.masks[k];
-    _combos[k]->setEnabled(!readOnly && !cmask.value.isOverlapping(cword.pmask) && cmask.values.count()!=1);
+    const Config::Mask &ctqmask = cword.tqmasks[k];
+    _combos[k]->setEnabled(!readOnly && !ctqmask.value.isOverlapping(cword.ptqmask) && ctqmask.values.count()!=1);
   }
 }
 
@@ -158,9 +158,9 @@ void Pic::ConfigWordEditor::slotModified()
   BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
   //qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
-    v = v.clearMaskBits(cmask.value);
-    v |= cmask.values[_combos[k]->index()].value; // set value
+    const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+    v = v.clearMaskBits(ctqmask.value);
+    v |= ctqmask.values[_combos[k]->index()].value; // set value
   }
   memory().setWord(MemoryRangeType::Config, _configIndex, v);
   //qDebug("  now: %s", toHex(v, 4).data());
@@ -174,12 +174,12 @@ void Pic::ConfigWordEditor::updateDisplay()
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   //qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data());
   for (uint k=0; k<_combos.count(); k++) {
-    const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
-    for (int i=cmask.values.count()-1; i>=0; i--) {
-      if ( cmask.values[i].value.isInside(v) ) {
-        if ( cmask.values[i].isValid() ) _combos[k]->setItem(i);
+    const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+    for (int i=ctqmask.values.count()-1; i>=0; i--) {
+      if ( ctqmask.values[i].value.isInside(v) ) {
+        if ( ctqmask.values[i].isValid() ) _combos[k]->setItem(i);
         else {
-          QString label = i18n("<invalid>") + " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
+          TQString label = i18n("<invalid>") + " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")";
           _combos[k]->setInvalidItem(i, label);
         }
         break;
diff --git a/src/devices/pic/gui/pic_config_word_editor.h b/src/devices/pic/gui/pic_config_word_editor.h
index 8f483c7..1b4077b 100644
--- a/src/devices/pic/gui/pic_config_word_editor.h
+++ b/src/devices/pic/gui/pic_config_word_editor.h
@@ -10,7 +10,7 @@
 #ifndef PIC_CONFIG_WORD_EDITOR_H
 #define PIC_CONFIG_WORD_EDITOR_H
 
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #include "common/gui/dialog.h"
 #include "common/gui/misc_gui.h"
@@ -22,23 +22,25 @@ namespace Pic
 class ConfigWordDialog : public Dialog
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigWordDialog(const Memory &memory, uint index, QWidget *parent);
+  ConfigWordDialog(const Memory &memory, uint index, TQWidget *tqparent);
 };
 
 //----------------------------------------------------------------------------
 class ConfigWordComboBox : public ComboBox
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigWordComboBox(QWidget *parent);
-  void appendItem(const QString &text, uint index) { insertItem(text); _map.append(index); }
+  ConfigWordComboBox(TQWidget *tqparent);
+  void appendItem(const TQString &text, uint index) { insertItem(text); _map.append(index); }
   uint index() const;
   void setItem(uint index);
-  void setInvalidItem(uint index, const QString &label);
+  void setInvalidItem(uint index, const TQString &label);
 
 private:
-  QValueVector<uint> _map; // item index -> value index
+  TQValueVector<uint> _map; // item index -> value index
   uint _invalidIndex; // if invalid -> value index
 
   bool isValid() const { return uint(count())==_map.count(); }
@@ -48,8 +50,9 @@ private:
 class ConfigWordEditor : public MemoryEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, QWidget *parent);
+  ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *tqparent);
   virtual void setReadOnly(bool readOnly);
 
 public slots:
@@ -62,7 +65,7 @@ private slots:
 private:
   uint _configIndex;
   MemoryRangeEditor *_mdb;
-  QValueVector<ConfigWordComboBox *> _combos;
+  TQValueVector<ConfigWordComboBox *> _combos;
 };
 
 } // namespace
diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index 3f7a84c..5483ee4 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -18,28 +18,28 @@
 #include "libgui/gui_debug_manager.h"
 #include "common/gui/list_container.h"
 
-Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, QWidget *parent) const
+Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const
 {
-  return new HexView(editor, parent);
+  return new HexView(editor, tqparent);
 }
 
-Register::View *Pic::GroupUI::createRegisterView(QWidget *parent) const
+Register::View *Pic::GroupUI::createRegisterView(TQWidget *tqparent) const
 {
-  return new RegisterView(parent);
+  return new RegisterView(tqparent);
 }
 
-Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, QWidget *parent) const
+Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const
 {
-  return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, parent);
+  return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, tqparent);
 }
 
-void Pic::GroupUI::fillWatchListContainer(ListContainer *container, QValueVector<Register::TypeData> &ids) const
+void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const
 {
   ids.clear();
   const Pic::Data &data = static_cast<const Pic::Data &>(*Main::deviceData());
   const Pic::RegistersData &rdata = data.registersData();
   ListContainer *branch = container->appendBranch(i18n("SFRs"));
-  QValueVector<Pic::RegisterNameData> list = Pic::sfrList(data);
+  TQValueVector<Pic::RegisterNameData> list = Pic::sfrList(data);
   for (uint i=0; i<list.count(); i++) {
     branch->appendItem(list[i].label(), ids.count(), ListContainer::UnChecked);
     ids.append(list[i].data());
@@ -47,7 +47,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, QValueVector
   branch = container->appendBranch(i18n("I/Os"));
   for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
     if ( !rdata.hasPort(i) ) continue;
-    QString name = rdata.portName(i);
+    TQString name = rdata.portName(i);
     branch->appendItem(name, ids.count(), ListContainer::UnChecked);
     ids.append(Register::TypeData(rdata.sfrs[name].address, rdata.nbChars()));
   }
@@ -56,7 +56,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, QValueVector
   list = Pic::gprList(data, coff);
   for (uint k=0; k<rdata.nbBanks; k++) {
     if ( !rdata.isBankUsed(k) ) continue;
-    ListContainer *bbranch = (rdata.nbBanks==1 ? branch : branch->appendBranch(i18n("Bank %1").arg(k)));
+    ListContainer *bbranch = (rdata.nbBanks==1 ? branch : branch->appendBranch(i18n("Bank %1").tqarg(k)));
     uint nb = 0;
     for (uint i=0; i<list.count(); i++) {
       if ( rdata.bankFromAddress(list[i].data().address())!=k ) continue;
@@ -81,7 +81,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, QValueVector
   }
 }
 
-Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *parent) const
+Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const
 {
-  return new Pic::RegisterListViewItem(data, parent);
+  return new Pic::RegisterListViewItem(data, tqparent);
 }
diff --git a/src/devices/pic/gui/pic_group_ui.h b/src/devices/pic/gui/pic_group_ui.h
index a8bee66..ac97f22 100644
--- a/src/devices/pic/gui/pic_group_ui.h
+++ b/src/devices/pic/gui/pic_group_ui.h
@@ -17,11 +17,11 @@ namespace Pic
 class GroupUI : public Device::GroupUI
 {
 public:
-  virtual Device::HexView *createHexView(const HexEditor &editor, QWidget *parent) const;
-  virtual Register::View *createRegisterView(QWidget *parent) const;
-  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, QWidget *parent) const;
-  virtual void fillWatchListContainer(ListContainer *container, QValueVector<Register::TypeData> &ids) const;
-  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const;
+  virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const;
+  virtual Register::View *createRegisterView(TQWidget *tqparent) const;
+  virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const;
+  virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const;
+  virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const;
 };
 
 } // namespace
diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp
index 07a1938..760b1ed 100644
--- a/src/devices/pic/gui/pic_hex_view.cpp
+++ b/src/devices/pic/gui/pic_hex_view.cpp
@@ -9,16 +9,16 @@
  ***************************************************************************/
 #include "pic_hex_view.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 
 #include <klocale.h>
 
 #include "pic_memory_editor.h"
 #include "pic_config_editor.h"
 
-Pic::HexView::HexView(const HexEditor &editor, QWidget *parent)
-  : Device::HexView(editor, parent, "pic_hex_view")
+Pic::HexView::HexView(const HexEditor &editor, TQWidget *tqparent)
+  : Device::HexView(editor, tqparent, "pic_hex_view")
 {}
 
 const Pic::MemoryRangeType::Type Pic::HexView::MEMORY_DATA[] = {
diff --git a/src/devices/pic/gui/pic_hex_view.h b/src/devices/pic/gui/pic_hex_view.h
index 2086ccb..54b679d 100644
--- a/src/devices/pic/gui/pic_hex_view.h
+++ b/src/devices/pic/gui/pic_hex_view.h
@@ -10,7 +10,7 @@
 #ifndef PIC_HEX_VIEW_H
 #define PIC_HEX_VIEW_H
 
-class QVBoxLayout;
+class TQVBoxLayout;
 
 #include "devices/gui/hex_view.h"
 #include "devices/pic/pic/pic_memory.h"
@@ -21,8 +21,9 @@ namespace Pic
 class HexView : public Device::HexView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexView(const HexEditor &editor, QWidget *parent);
+  HexView(const HexEditor &editor, TQWidget *tqparent);
   Memory *memory() { return static_cast<Memory *>(_memory); }
   const Memory *memory() const { return static_cast<Memory *>(_memory); }
   virtual uint nbChecksumChars() const { return 4; }
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index 3d78097..50f686a 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -9,17 +9,17 @@
  ***************************************************************************/
 #include "pic_memory_editor.h"
 
-#include <qframe.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qscrollbar.h>
-#include <qgrid.h>
-#include <qhbox.h>
-#include <qtooltip.h>
-#include <qregexp.h>
-#include <qcolor.h>
-#include <qlayout.h>
-#include <qpixmap.h>
+#include <tqframe.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqscrollbar.h>
+#include <tqgrid.h>
+#include <tqhbox.h>
+#include <tqtooltip.h>
+#include <tqregexp.h>
+#include <tqcolor.h>
+#include <tqlayout.h>
+#include <tqpixmap.h>
 
 #include <klocale.h>
 #include <kpushbutton.h>
@@ -34,17 +34,17 @@
 #include "pic_hex_view.h"
 
 //-----------------------------------------------------------------------------
-Pic::MemoryEditorLegend::Data::Data(const QString &text, QWidget *parent)
+Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *tqparent)
 {
-  button = new PopupButton(text, parent);
+  button = new PopupButton(text, tqparent);
   KActionCollection *ac = 0;
-  KAction *a = new KAction(i18n("Go to start"), "top", 0, parent, SLOT(gotoStart()), ac);
+  KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoStart()), ac);
   actions.append(a);
   button->appendAction(a);
-  a = new KAction(i18n("Go to end"), "bottom", 0, parent, SLOT(gotoEnd()), ac);
+  a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoEnd()), ac);
   actions.append(a);
   button->appendAction(a);
-  label = new QLabel(parent);
+  label = new TQLabel(tqparent);
 }
 
 void Pic::MemoryEditorLegend::Data::setProtected(bool on)
@@ -64,24 +64,24 @@ const char * const Pic::MemoryEditorLegend::BLOCK_COLORS[Protection::MAX_NB_BLOC
   "#88FF88", "#88FFFF", "#FFFF88", "#FF88FF", "#0088FF", "#88FF00", "#00FF88", "#FF8800"
 };
 
-Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, QWidget *parent)
-  : MemoryEditor(type, memory, parent, "memory_displayer_legend")
+Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent)
+  : MemoryEditor(type, memory, tqparent, "memory_displayer_legend")
 {
-  QGridLayout *grid = new QGridLayout(_top);
+  TQGridLayout *grid = new TQGridLayout(_top);
 
-  QWidget *w = new QWidget(this);
+  TQWidget *w = new TQWidget(this);
   w->setFixedWidth(20);
   w->setPaletteBackgroundColor(protectedColor());
   grid->addWidget(w, 0, 0);
   const Protection &protection = device().config().protection();
-  QString s = (protection.family()==Protection::CodeGuard ? i18n("High Security") : i18n("Code protection"));
-  QLabel *label = new QLabel(s, this);
+  TQString s = (protection.family()==Protection::CodeGuard ? i18n("High Security") : i18n("Code protection"));
+  TQLabel *label = new TQLabel(s, this);
   grid->addMultiCellWidget(label, 0,0, 1,2);
   grid->addRowSpacing(1, 10);
   uint row = 2;
 
   if ( type==MemoryRangeType::Code && protection.hasBootBlock() ) {
-    w = new QWidget(this);
+    w = new TQWidget(this);
     w->setFixedWidth(20);
     w->setPaletteBackgroundColor(bootColor());
     grid->addWidget(w, row, 0);
@@ -93,7 +93,7 @@ Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory
 
   uint nb = (type==MemoryRangeType::Code ? protection.nbBlocks() : 0);
   for (uint i=0; i<nb; i++) {
-    w = new QWidget(this);
+    w = new TQWidget(this);
     w->setFixedWidth(20);
     w->setPaletteBackgroundColor(blockColor(i));
     grid->addWidget(w, row, 0);
@@ -112,14 +112,14 @@ void Pic::MemoryEditorLegend::updateDisplay()
   if (_boot.label) {
     AddressRange r = memory().bootRange();
     if ( r.isEmpty() ) _boot.label->setText(i18n("not present"));
-    else _boot.label->setText(QString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
+    else _boot.label->setText(TQString("[%1:%2]").tqarg(toHex(r.start, nbChars)).tqarg(toHex(r.end, nbChars)));
     _boot.button->setEnabled(!r.isEmpty());
     _boot.setProtected(memory().isBootProtected(ptype));
   }
   for (uint i=0; i<_blocks.count(); i++) {
     AddressRange r = memory().blockRange(i);
     if ( r.isEmpty() ) _blocks[i].label->setText(i18n("not present"));
-    else _blocks[i].label->setText(QString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
+    else _blocks[i].label->setText(TQString("[%1:%2]").tqarg(toHex(r.start, nbChars)).tqarg(toHex(r.end, nbChars)));
     _blocks[i].button->setEnabled(!r.isEmpty());
     _blocks[i].setProtected(memory().isBlockProtected(ptype, i));
   }
@@ -165,8 +165,8 @@ void Pic::MemoryEditorLegend::gotoEnd()
 
 
 //-----------------------------------------------------------------------------
-Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, QWidget *parent)
-  : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), parent),
+Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent)
+  : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), tqparent),
     MemoryCaster(type, memory)
 {}
 
@@ -174,7 +174,7 @@ void Pic::HexWordEditor::setWord(BitValue value)
 {
   if ( type()==MemoryRangeType::Config ) {
     const Config::Word &cword = device().config()._words[_offset];
-    value |= cword.usedMask().complementInMask(device().mask(MemoryRangeType::Config));
+    value |= cword.usedMask().complementInMask(device().tqmask(MemoryRangeType::Config));
   }
   memory().setWord(type(), _offset, value);
 }
@@ -182,19 +182,19 @@ void Pic::HexWordEditor::setWord(BitValue value)
 //-----------------------------------------------------------------------------
 Pic::MemoryRangeEditor::MemoryRangeEditor(MemoryRangeType type, Memory &memory,
                                           uint nbLines, uint nbCols,
-                                          uint wordOffset, int nbWords, QWidget *parent)
-  : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, parent, "pic_memory_range_editor"),
+                                          uint wordOffset, int nbWords, TQWidget *tqparent)
+  : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, tqparent, "pic_memory_range_editor"),
     MemoryCaster(type, memory), _legend(0)
 {
   if ( type==MemoryRangeType::Code ) _blockRanges.resize(memory.device().config().protection().nbBlocks());
 }
 
-void Pic::MemoryRangeEditor::addLegend(QVBoxLayout *vbox)
+void Pic::MemoryRangeEditor::addLegend(TQVBoxLayout *vbox)
 {
   if ( type()==MemoryRangeType::Code || type()==MemoryRangeType::Eeprom ) {
     _legend = new MemoryEditorLegend(type(), memory(), this);
-    connect(_legend, SIGNAL(setStartWord(int)), SLOT(setStartWord(int)));
-    connect(_legend, SIGNAL(setEndWord(int)), SLOT(setEndWord(int)));
+    connect(_legend, TQT_SIGNAL(setStartWord(int)), TQT_SLOT(setStartWord(int)));
+    connect(_legend, TQT_SIGNAL(setEndWord(int)), TQT_SLOT(setEndWord(int)));
     vbox->addWidget(_legend);
   }
 }
@@ -220,28 +220,28 @@ void Pic::MemoryRangeEditor::updateDisplay()
 
 void Pic::MemoryRangeEditor::updateAddressColor(uint i, Address address)
 {
-  if ( _codeProtected.contains(address) )
+  if ( _codeProtected.tqcontains(address) )
     _addresses[i]->setPaletteBackgroundColor(MemoryEditorLegend::protectedColor());
   else _addresses[i]->unsetPalette();
   _blocks[i]->unsetPalette();
   if ( type()==MemoryRangeType::Code ) {
-    if ( _bootRange.contains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
+    if ( _bootRange.tqcontains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
     else for (uint k=0; k<_blockRanges.count(); k++) {
-      if ( !_blockRanges[k].contains(address) ) continue;
+      if ( !_blockRanges[k].tqcontains(address) ) continue;
       _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::blockColor(k));
       break;
     }
   }
 }
 
-Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(QWidget *parent)
+Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent)
 {
-  return new HexWordEditor(type(), memory(), parent);
+  return new HexWordEditor(type(), memory(), tqparent);
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent, const char *name)
-  : Device::MemoryTypeEditor(hexview, memory, parent, name), MemoryCaster(type, memory)
+Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name)
+  : Device::MemoryTypeEditor(hexview, memory, tqparent, name), MemoryCaster(type, memory)
 {}
 
 void Pic::MemoryTypeEditor::init(bool first)
@@ -250,11 +250,11 @@ void Pic::MemoryTypeEditor::init(bool first)
   _title->setText(type().label());
 
   uint nbChars = device().nbCharsWord(type());
-  QString add;
-  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended mask: %1").arg(toHexLabel(device().userIdRecommendedMask(), nbChars));
+  TQString add;
+  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended tqmask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars));
   if ( type()==MemoryRangeType::Cal && _hexview ) add = i18n(" - not programmed by default");
-  QString comment = i18n("%1-bit words - mask: %2")
-                   .arg(device().nbBitsWord(type())).arg(toHexLabel(device().mask(type()), nbChars));
+  TQString comment = i18n("%1-bit words - tqmask: %2")
+                   .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().tqmask(type()), nbChars));
   _comment->setText(comment + add);
 }
 
@@ -291,8 +291,8 @@ bool Pic::MemoryTypeEditor::internalDoAction(Device::Action action)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent)
-  : MemoryTypeEditor(hexview, type, memory, parent, "pic_memory_type_range_editor"), _mre(0)
+Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent)
+  : MemoryTypeEditor(hexview, type, memory, tqparent, "pic_memory_type_range_editor"), _mre(0)
 {}
 
 void Pic::MemoryTypeRangeEditor::init(bool first)
@@ -309,15 +309,15 @@ void Pic::MemoryTypeRangeEditor::init(bool first)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, QWidget *parent)
-  : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, parent), _saveReadOnly(false)
+Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
+  : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, tqparent), _saveReadOnly(false)
 {}
 
 void Pic::MemoryUserIdEditor::init(bool first)
 {
   MemoryTypeRangeEditor::init(first);
   _setToChecksum = new KToggleAction(i18n("Set to unprotected checksum"), 0, 0,
-    this, SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection());
+    TQT_TQOBJECT(this), TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection());
   addAction(_setToChecksum);
   if ( readConfigEntry(BaseGlobalConfig::UserIdSetToChecksum).toBool() && memory().isClear(MemoryRangeType::UserId) ) {
     _setToChecksum->activate();
@@ -330,7 +330,7 @@ void Pic::MemoryUserIdEditor::toggleSetToChecksum()
   if ( _setToChecksum->isChecked() ) {
     _mre->setComment(i18n("Set to unprotected checksum"));
     emit modified();
-  } else _mre->setComment(QString::null);
+  } else _mre->setComment(TQString());
   setReadOnly(_saveReadOnly);
 }
 
@@ -347,8 +347,8 @@ void Pic::MemoryUserIdEditor::setReadOnly(bool readOnly)
 }
 
 //-----------------------------------------------------------------------------
-Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, QWidget *parent)
-  : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, parent, "pic_memory_calibration_editor")
+Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent)
+  : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, tqparent, "pic_memory_calibration_editor")
 {}
 
 void Pic::MemoryCalibrationEditor::init(bool first)
diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h
index bf67cd1..2a6f72f 100644
--- a/src/devices/pic/gui/pic_memory_editor.h
+++ b/src/devices/pic/gui/pic_memory_editor.h
@@ -10,8 +10,8 @@
 #ifndef PIC_MEMORY_EDITOR_H
 #define PIC_MEMORY_EDITOR_H
 
-#include <qscrollbar.h>
-#include <qgroupbox.h>
+#include <tqscrollbar.h>
+#include <tqgroupbox.h>
 class KToggleAction;
 
 #include "devices/gui/memory_editor.h"
@@ -42,22 +42,24 @@ private:
 class MemoryEditor : public Device::MemoryEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditor(MemoryRangeType type, Memory &memory, QWidget *parent, const char *name)
-    : Device::MemoryEditor(&memory, parent, name), MemoryCaster(type, memory) {}
+  MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name)
+    : Device::MemoryEditor(&memory, tqparent, name), MemoryCaster(type, memory) {}
 };
 
 //-----------------------------------------------------------------------------
 class MemoryEditorLegend : public MemoryEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryEditorLegend(MemoryRangeType type, Memory &memory, QWidget *parent);
+  MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
   virtual void setReadOnly(bool) {}
 
-  static QColor protectedColor() { return QColor("#FF8888"); }
-  static QColor bootColor() { return QColor("#8888FF"); }
-  static QColor blockColor(uint i) { return QColor(BLOCK_COLORS[i]); }
+  static TQColor protectedColor() { return TQColor("#FF8888"); }
+  static TQColor bootColor() { return TQColor("#8888FF"); }
+  static TQColor blockColor(uint i) { return TQColor(BLOCK_COLORS[i]); }
 
 signals:
   void setStartWord(int i);
@@ -74,15 +76,15 @@ private:
   class Data {
   public:
     Data() : button(0), label(0) {}
-    Data(const QString &text, QWidget *parent);
+    Data(const TQString &text, TQWidget *tqparent);
     void setProtected(bool on);
     bool hasAction(const KAction *action) const;
     PopupButton *button;
-    QLabel      *label;
-    QValueVector<KAction *> actions;
+    TQLabel      *label;
+    TQValueVector<KAction *> actions;
   };
   Data _boot;
-  QValueVector<Data> _blocks;
+  TQValueVector<Data> _blocks;
 
   static const char * const BLOCK_COLORS[Protection::MAX_NB_BLOCKS];
 };
@@ -91,11 +93,12 @@ private:
 class HexWordEditor : public Device::HexWordEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HexWordEditor(MemoryRangeType type, Memory &memory, QWidget *parent);
+  HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent);
 
 private:
-  virtual BitValue mask() const { return memory().device().mask(type()); }
+  virtual BitValue tqmask() const { return memory().device().tqmask(type()); }
   virtual BitValue normalizeWord(BitValue value) const { return memory().normalizeWord(type(), _offset, value); }
   virtual BitValue word() const { return memory().word(type(), _offset); }
   virtual void setWord(BitValue value);
@@ -105,9 +108,10 @@ private:
 class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   MemoryRangeEditor(MemoryRangeType type, Memory &memory,
-                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, QWidget *parent);
+                    uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *tqparent);
 
 public slots:
   virtual void updateDisplay();
@@ -121,18 +125,19 @@ private:
   virtual uint nbWords() const { return device().nbWords(type()); }
   virtual uint addressIncrement() const { return device().addressIncrement(type()); }
   virtual Address startAddress() const { return device().range(type()).start; }
-  virtual Device::HexWordEditor *createHexWordEditor(QWidget *parent);
+  virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent);
   virtual void updateAddressColor(uint i, Address address);
   virtual bool isRangeReadOnly() const;
-  virtual void addLegend(QVBoxLayout *vbox);
+  virtual void addLegend(TQVBoxLayout *vbox);
 };
 
 //-----------------------------------------------------------------------------
 class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent, const char *name);
+  MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name);
   virtual void init(bool first);
 
 private:
@@ -143,8 +148,9 @@ private:
 class MemoryTypeRangeEditor : public MemoryTypeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, QWidget *parent);
+  MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 
 protected:
@@ -155,8 +161,9 @@ protected:
 class MemoryUserIdEditor : public MemoryTypeRangeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryUserIdEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
   virtual void setReadOnly(bool readOnly);
 
@@ -175,8 +182,9 @@ private:
 class MemoryCalibrationEditor : public MemoryTypeEditor
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, QWidget *parent);
+  MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent);
   virtual void init(bool first);
 
 private:
diff --git a/src/devices/pic/gui/pic_prog_group_ui.cpp b/src/devices/pic/gui/pic_prog_group_ui.cpp
index e063b77..8f2f225 100644
--- a/src/devices/pic/gui/pic_prog_group_ui.cpp
+++ b/src/devices/pic/gui/pic_prog_group_ui.cpp
@@ -11,17 +11,17 @@
 #include "progs/gui/prog_config_widget.h"
 #include "progs/base/prog_group.h"
 
-Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, QWidget *parent, const char *name)
-  : AdvancedDialog(base, parent, name)
+Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name)
+  : AdvancedDialog(base, tqparent, name)
 {
   if (_voltagesContainer) {
     uint k = _voltagesContainer->numRows();
     for (uint i=0; i<Pic::Nb_VoltageTypes; i++) {
       if ( !base.group().canReadVoltage(Pic::VoltageType(i)) ) _voltages[i] = 0;
       else {
-        QLabel *label = new QLabel(i18n(Pic::VOLTAGE_TYPE_LABELS[i]) + ":", _voltagesContainer);
+        TQLabel *label = new TQLabel(i18n(Pic::VOLTAGE_TYPE_LABELS[i]) + ":", _voltagesContainer);
         _voltagesContainer->addWidget(label, k,k, 0,0);
-        _voltages[i] = new QLabel(_voltagesContainer);
+        _voltages[i] = new TQLabel(_voltagesContainer);
         _voltagesContainer->addWidget(_voltages[i], k,k, 1,1);
         k++;
       }
@@ -36,6 +36,6 @@ void Programmer::PicAdvancedDialog::updateDisplay()
     if ( !base().group().canReadVoltage(Pic::VoltageType(i)) ) continue;
     double v = base().voltage(Pic::VoltageType(i));
     if ( v==::Programmer::UNKNOWN_VOLTAGE ) _voltages[i]->setText("---");
-    else _voltages[i]->setText(QString("%1 V").arg(v));
+    else _voltages[i]->setText(TQString("%1 V").tqarg(v));
   }
 }
diff --git a/src/devices/pic/gui/pic_prog_group_ui.h b/src/devices/pic/gui/pic_prog_group_ui.h
index 75821b5..1a8540e 100644
--- a/src/devices/pic/gui/pic_prog_group_ui.h
+++ b/src/devices/pic/gui/pic_prog_group_ui.h
@@ -17,12 +17,13 @@ namespace Programmer
 class PicAdvancedDialog : public ::Programmer::AdvancedDialog
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  PicAdvancedDialog(PicBase &base, QWidget *parent, const char *name);
+  PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name);
   virtual void updateDisplay();
 
 private:
-  QLabel *_voltages[Pic::Nb_VoltageTypes];
+  TQLabel *_voltages[Pic::Nb_VoltageTypes];
   PicBase &base() { return static_cast<PicBase &>(_base); }
 };
 
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index ef7de9b..ced5085 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -8,12 +8,12 @@
  ***************************************************************************/
 #include "pic_register_view.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qpopupmenu.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqpopupmenu.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -29,13 +29,13 @@
 #include "coff/base/text_coff.h"
 
 //-----------------------------------------------------------------------------
-Pic::BankWidget::BankWidget(uint i, QWidget *parent)
-  : QFrame(parent, "bank_widget"), _bindex(i), _bankCombo(0)
+Pic::BankWidget::BankWidget(uint i, TQWidget *tqparent)
+  : TQFrame(tqparent, "bank_widget"), _bindex(i), _bankCombo(0)
 {
   setFrameStyle(WinPanel | Sunken);
-  QGridLayout *top = new QGridLayout(this, 1, 1, 5, 0);
+  TQGridLayout *top = new TQGridLayout(this, 1, 1, 5, 0);
   top->setColSpacing(1, 4);
-  QFont f("courier", font().pointSize());
+  TQFont f("courier", font().pointSize());
 
   const Pic::Data &data = static_cast<const Pic::Data &>(*Main::deviceData());
   const Pic::RegistersData &rdata = data.registersData();
@@ -44,22 +44,22 @@ Pic::BankWidget::BankWidget(uint i, QWidget *parent)
   if ( rdata.nbBanks!=1 ) {
     if ( data.is18Family() ) {
       if ( (i/2)==0 ) {
-        QString title = ((i%2)==0 ? i18n("Access Bank (low)") : i18n("Access Bank (high)"));
-        QLabel *label = new QLabel(title, this);
-        label->setAlignment(AlignCenter);
+        TQString title = ((i%2)==0 ? i18n("Access Bank (low)") : i18n("Access Bank (high)"));
+        TQLabel *label = new TQLabel(title, this);
+        label->tqsetAlignment(AlignCenter);
         top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter);
       } else {
-        _bankCombo = new QComboBox(this);
+        _bankCombo = new TQComboBox(this);
         for (uint k=1; k<2*rdata.nbBanks-1; k++) {
-	  _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").arg(k/2) : i18n("Bank %1 (high)").arg(k/2));
+	  _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").tqarg(k/2) : i18n("Bank %1 (high)").tqarg(k/2));
 	}
         if ( _bindex==3 ) _bankCombo->setCurrentItem(1);
-        connect(_bankCombo, SIGNAL(activated(int)), SLOT(bankChanged()));
+        connect(_bankCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bankChanged()));
         top->addMultiCellWidget(_bankCombo, row,row, 0,6, AlignHCenter);
       }
     } else {
-      QLabel *label = new QLabel(i18n("Bank %1").arg(i), this);
-      label->setAlignment(AlignCenter);
+      TQLabel *label = new TQLabel(i18n("Bank %1").tqarg(i), this);
+      label->tqsetAlignment(AlignCenter);
       top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter);
     }
     row++;
@@ -68,14 +68,14 @@ Pic::BankWidget::BankWidget(uint i, QWidget *parent)
   }
 
   KIconLoader loader;
-  QPixmap readIcon = loader.loadIcon("viewmag", KIcon::Small);
-  QPixmap editIcon = loader.loadIcon("edit", KIcon::Small);
+  TQPixmap readIcon = loader.loadIcon("viewmag", KIcon::Small);
+  TQPixmap editIcon = loader.loadIcon("edit", KIcon::Small);
   uint nb;
   if ( !data.is18Family() ) nb = rdata.nbRegistersPerBank();
   else nb = kMax(rdata.accessBankSplit, rdata.nbRegistersPerBank() - rdata.accessBankSplit);
   _registers.resize(nb);
   for (uint k=0; k<nb; k++) {
-    _registers[k].alabel = new QLabel(this);
+    _registers[k].alabel = new TQLabel(this);
     _registers[k].alabel->setFont(f);
     top->addWidget(_registers[k].alabel, row, 0);
     if (debugging) {
@@ -83,14 +83,14 @@ Pic::BankWidget::BankWidget(uint i, QWidget *parent)
       _registers[k].button->appendItem(i18n("Read"), readIcon, ReadId);
       _registers[k].button->appendItem(i18n("Edit"), editIcon, EditId);
       _registers[k].button->appendItem(i18n("Watch"), WatchId);
-      connect(_registers[k].button, SIGNAL(activated(int)), SLOT(buttonActivated(int)));
+      connect(_registers[k].button, TQT_SIGNAL(activated(int)), TQT_SLOT(buttonActivated(int)));
       top->addWidget(_registers[k].button, row, 2);
       _registers[k].edit = new Register::LineEdit(this);
-      connect(_registers[k].edit, SIGNAL(modified()), SLOT(write()));
+      connect(_registers[k].edit, TQT_SIGNAL(modified()), TQT_SLOT(write()));
       _registers[k].edit->setFont(f);
       top->addWidget(_registers[k].edit, row, 6);
     } else {
-      _registers[k].label = new QLabel(this);
+      _registers[k].label = new TQLabel(this);
       top->addWidget(_registers[k].label, row, 2);
     }
     row++;
@@ -203,11 +203,11 @@ void Pic::BankWidget::updateView()
   for (uint i=0; i<_registers.count(); i++) {
     uint address = _registers[i].address;
     Device::RegisterProperties rp = rdata.properties(address);
-    QString label = rdata.label(address);
+    TQString label = rdata.label(address);
     Register::TypeData rtd(address, rdata.nbChars());
     bool isWatched = Register::list().isWatched(rtd);
     if (coff) {
-      QString name = coff->variableName(address);
+      TQString name = coff->variableName(address);
       if ( !name.isEmpty() ) label = "<" + name + ">";
     }
     if (_registers[i].button) {
@@ -215,7 +215,7 @@ void Pic::BankWidget::updateView()
 	_registers[i].button->show();
 	_registers[i].button->setText(label);
 	if (isWatched) {
-	  QFont f = _registers[i].button->font();
+	  TQFont f = _registers[i].button->font();
 	  f.setBold(true);
 	  _registers[i].button->setFont(f);
 	} else _registers[i].button->unsetFont();
@@ -245,36 +245,36 @@ void Pic::BankWidget::updateView()
 }
 
 //-----------------------------------------------------------------------------
-Pic::RegisterView::RegisterView(QWidget *parent)
-  : Register::View(parent, "pic_register_view"),
+Pic::RegisterView::RegisterView(TQWidget *tqparent)
+  : Register::View(tqparent, "pic_register_view"),
     _readAllButton(0), _clearAllButton(0)
 {
-  QVBoxLayout *vbox = new QVBoxLayout(this, 10, 10);
-  QHBoxLayout *hbox = new QHBoxLayout(vbox);
+  TQVBoxLayout *vbox = new TQVBoxLayout(this, 10, 10);
+  TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
 
   bool debugging = Main::programmerGroup().isDebugger();
   const Pic::Data &data = static_cast<const Pic::Data &>(*Main::deviceData());
   uint nb = data.registersData().nbBanks;
   if ( debugging && nb!=0 ) {
-    QWidget *w = new QWidget(this);
+    TQWidget *w = new TQWidget(this);
     hbox->addWidget(w);
-    QGridLayout *grid = new QGridLayout(w, 1, 1, 0, 10);
-    _readAllButton = new QPushButton(i18n("Read All"), w);
-    connect(_readAllButton, SIGNAL(clicked()), Debugger::manager, SLOT(readAllRegisters()));
+    TQGridLayout *grid = new TQGridLayout(w, 1, 1, 0, 10);
+    _readAllButton = new TQPushButton(i18n("Read All"), w);
+    connect(_readAllButton, TQT_SIGNAL(clicked()), Debugger::manager, TQT_SLOT(readAllRegisters()));
     grid->addWidget(_readAllButton, 0, 0);
-    _clearAllButton = new QPushButton(i18n("Clear all watching"), w);
-    connect(_clearAllButton, SIGNAL(clicked()), SLOT(stopWatchAllRegisters()));
+    _clearAllButton = new TQPushButton(i18n("Clear all watching"), w);
+    connect(_clearAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopWatchAllRegisters()));
     grid->addWidget(_clearAllButton, 0, 1);
     grid->setColStretch(2, 1);
   }
 
-  QHBoxLayout *hbox2 = 0;
+  TQHBoxLayout *hbox2 = 0;
   if ( nb==0 ) {
-    QLabel *label = new QLabel(i18n("Registers information not available."), this);
+    TQLabel *label = new TQLabel(i18n("Registers information not available."), this);
     vbox->addWidget(label);
   } else {
-    hbox = new QHBoxLayout(vbox);
-    hbox2 = new QHBoxLayout(hbox);
+    hbox = new TQHBoxLayout(vbox);
+    hbox2 = new TQHBoxLayout(hbox);
     hbox->addStretch(1);
     if ( data.is18Family() ) {
       nb = 2;
@@ -306,8 +306,8 @@ void Pic::RegisterView::stopWatchAllRegisters()
 }
 
 //----------------------------------------------------------------------------
-Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent)
-  : Register::ListViewItem(data, parent)
+Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent)
+  : Register::ListViewItem(data, tqparent)
 {}
 
 uint Pic::RegisterListViewItem::nbCharsAddress() const
@@ -316,12 +316,12 @@ uint Pic::RegisterListViewItem::nbCharsAddress() const
   return data.registersData().nbCharsAddress();
 }
 
-QString Pic::RegisterListViewItem::label() const
+TQString Pic::RegisterListViewItem::label() const
 {
   if ( _data.type()!=Register::Regular ) return _data.name();
   const Coff::Object *coff = Debugger::manager->coff();
   if (coff) {
-    QString name = coff->variableName(_data.address());
+    TQString name = coff->variableName(_data.address());
     if ( !name.isEmpty() ) return "<" + name + ">";
   }
   const Pic::Data &data = static_cast<const Pic::Data &>(*Main::deviceData());
diff --git a/src/devices/pic/gui/pic_register_view.h b/src/devices/pic/gui/pic_register_view.h
index f5b9d4b..0f347e4 100644
--- a/src/devices/pic/gui/pic_register_view.h
+++ b/src/devices/pic/gui/pic_register_view.h
@@ -9,11 +9,11 @@
 #ifndef PIC_REGISTER_VIEW_H
 #define PIC_REGISTER_VIEW_H
 
-#include <qvaluevector.h>
-class QPushButton;
-class QCheckBox;
-class QLabel;
-class QComboBox;
+#include <tqvaluevector.h>
+class TQPushButton;
+class TQCheckBox;
+class TQLabel;
+class TQComboBox;
 
 #include "devices/gui/register_view.h"
 #include "devices/pic/base/pic.h"
@@ -24,11 +24,12 @@ namespace Device { class RegisterHexWordEditor; }
 namespace Pic
 {
 //-----------------------------------------------------------------------------
-class BankWidget : public QFrame
+class BankWidget : public TQFrame
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  BankWidget(uint bank, QWidget *parent);
+  BankWidget(uint bank, TQWidget *tqparent);
   void updateView();
 
 private slots:
@@ -42,13 +43,13 @@ private:
   public:
     Data() : label(0), button(0), edit(0) {}
     uint address;
-    QLabel *alabel, *label;
+    TQLabel *alabel, *label;
     PopupButton *button;
     Register::LineEdit *edit;
   };
   uint _bindex;
-  QComboBox *_bankCombo;
-  QValueVector<Data> _registers;
+  TQComboBox *_bankCombo;
+  TQValueVector<Data> _registers;
 
   uint bank() const;
   uint nbRegisters() const;
@@ -60,27 +61,28 @@ private:
 class RegisterView : public Register::View
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  RegisterView(QWidget *parent);
+  RegisterView(TQWidget *tqparent);
   virtual void updateView();
 
 private slots:
   void stopWatchAllRegisters();
 
 private:
-  QPushButton *_readAllButton, *_clearAllButton;
-  QValueVector<BankWidget *> _banks;
+  TQPushButton *_readAllButton, *_clearAllButton;
+  TQValueVector<BankWidget *> _banks;
 };
 
 //-----------------------------------------------------------------------------
 class RegisterListViewItem : public Register::ListViewItem
 {
 public:
-  RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent);
+  RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent);
 
 private:
   virtual uint nbCharsAddress() const;
-  virtual QString label() const;
+  virtual TQString label() const;
 };
 
 } // namespace
diff --git a/src/devices/pic/pic/pic_group.cpp b/src/devices/pic/pic/pic_group.cpp
index 639d2cf..311bff3 100644
--- a/src/devices/pic/pic/pic_group.cpp
+++ b/src/devices/pic/pic/pic_group.cpp
@@ -9,7 +9,7 @@
 #include "pic_group.h"
 
 #if !defined(NO_KDE)
-# include <qpainter.h>
+# include <tqpainter.h>
 #endif
 
 #include "pic_memory.h"
@@ -20,35 +20,35 @@ Device::Memory *Pic::Group::createMemory(const Device::Data &data) const
   return new Memory(static_cast<const Pic::Data &>(data));
 }
 
-QString Pic::Group::informationHtml(const Device::Data &data) const
+TQString Pic::Group::informationHtml(const Device::Data &data) const
 {
   const Pic::Data &pdata = static_cast<const Pic::Data &>(data);
   // memory type
-  QString s = htmlTableRow(i18n("Memory Type"), data.memoryTechnology().label());
+  TQString s = htmlTableRow(i18n("Memory Type"), data.memoryTechnology().label());
   if ( pdata.isPresent(MemoryRangeType::Code) ) {
     uint nbw = pdata.nbWords(MemoryRangeType::Code);
-    QString tmp = i18n("%1 words").arg(formatNumber(nbw));
-    tmp += i18n(" (%2 bits)").arg(pdata.nbBitsWord(MemoryRangeType::Code));
+    TQString tmp = i18n("%1 words").tqarg(formatNumber(nbw));
+    tmp += i18n(" (%2 bits)").tqarg(pdata.nbBitsWord(MemoryRangeType::Code));
     s += htmlTableRow(MemoryRangeType(MemoryRangeType::Code).label(), tmp);
   }
   if ( pdata.isPresent(MemoryRangeType::Eeprom) ) {
     uint nbw = pdata.nbWords(MemoryRangeType::Eeprom);
-    QString tmp = i18n("%1 bytes").arg(formatNumber(nbw));
-    tmp += i18n(" (%2 bits)").arg(pdata.nbBitsWord(MemoryRangeType::Eeprom));
+    TQString tmp = i18n("%1 bytes").tqarg(formatNumber(nbw));
+    tmp += i18n(" (%2 bits)").tqarg(pdata.nbBitsWord(MemoryRangeType::Eeprom));
     if ( !(pdata.range(MemoryRangeType::Eeprom).properties & Programmable) ) tmp += i18n(" (not programmable)");
     s += htmlTableRow(MemoryRangeType(MemoryRangeType::Eeprom).label(), tmp);
   }
 
   // io ports
   const Pic::RegistersData &rdata = pdata.registersData();
-  QString tmp;
+  TQString tmp;
   if ( rdata.nbBanks!=0 ) {
     uint nb = 0;
     for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
       if ( !rdata.hasPort(i) ) continue;
       uint nbBits = 0;
       for (uint k=0; k<Device::MAX_NB_PORT_BITS; k++) if ( rdata.hasPortBit(i, k) ) nbBits++;
-      tmp += rdata.portName(i) + "[" + QString::number(nbBits) + "] ";
+      tmp += rdata.portName(i) + "[" + TQString::number(nbBits) + "] ";
       nb++;
     }
     if ( nb==0 ) tmp = i18n("<none>");
@@ -56,7 +56,7 @@ QString Pic::Group::informationHtml(const Device::Data &data) const
   }
 
   // features
-  tmp = QString::null;
+  tmp = TQString();
   FOR_EACH(Feature, feature) {
     if ( !pdata.hasFeature(feature) ) continue;
     if ( !tmp.isEmpty() ) tmp += ", ";
@@ -68,10 +68,10 @@ QString Pic::Group::informationHtml(const Device::Data &data) const
 }
 
 #if !defined(NO_KDE)
-QPixmap Pic::Group::memoryGraph(const Device::Data &data) const
+TQPixmap Pic::Group::memoryGraph(const Device::Data &data) const
 {
   const Pic::Data &pdata = static_cast<const Pic::Data &>(data);
-  QValueList<Device::MemoryGraphData> ranges;
+  TQValueList<Device::MemoryGraphData> ranges;
   FOR_EACH(Pic::MemoryRangeType, type) {
     if ( type==Pic::MemoryRangeType::Eeprom || !pdata.isPresent(type) ) continue;
     Device::MemoryGraphData data;
diff --git a/src/devices/pic/pic/pic_group.h b/src/devices/pic/pic/pic_group.h
index 1b95e09..844e370 100644
--- a/src/devices/pic/pic/pic_group.h
+++ b/src/devices/pic/pic/pic_group.h
@@ -21,12 +21,12 @@ extern const char *DATA_STREAM;
 class Group : public Device::Group<Data>
 {
 public:
-  virtual QString name() const { return "pic"; }
-  virtual QString label() const { return i18n("PIC"); }
+  virtual TQString name() const { return "pic"; }
+  virtual TQString label() const { return i18n("PIC"); }
   virtual Device::Memory *createMemory(const Device::Data &data) const;
-  virtual QString informationHtml(const Device::Data &data) const;
+  virtual TQString informationHtml(const Device::Data &data) const;
 #if !defined(NO_KDE)
-  virtual QPixmap memoryGraph(const Device::Data &data) const;
+  virtual TQPixmap memoryGraph(const Device::Data &data) const;
 #endif
 
 private:
diff --git a/src/devices/pic/pic/pic_memory.cpp b/src/devices/pic/pic/pic_memory.cpp
index cccb2f9..8567790 100644
--- a/src/devices/pic/pic/pic_memory.cpp
+++ b/src/devices/pic/pic/pic_memory.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pic_memory.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include "common/common/misc.h"
 
@@ -58,7 +58,7 @@ Device::Array Pic::Memory::arrayForWriting(MemoryRangeType type) const
 {
   Device::Array data = _ranges[type];
   for (uint i=0; i<data.count(); i++)
-    data[i] = data[i].maskWith(type==MemoryRangeType::Config ? device().config()._words[i].wmask : device().mask(type));
+    data[i] = data[i].tqmaskWith(type==MemoryRangeType::Config ? device().config()._words[i].wtqmask : device().tqmask(type));
   return data;
 }
 
@@ -72,10 +72,10 @@ BitValue Pic::Memory::normalizeWord(MemoryRangeType type, uint offset, BitValue
 {
   if ( type==MemoryRangeType::Config) {
     const Config::Word &cword = device().config()._words[offset];
-    return value.maskWith(cword.usedMask());
+    return value.tqmaskWith(cword.usedMask());
   }
-  if ( type==MemoryRangeType::UserId ) return value.maskWith(device().userIdRecommendedMask());
-  return value.maskWith(device().mask(type));
+  if ( type==MemoryRangeType::UserId ) return value.tqmaskWith(device().userIdRecommendedMask());
+  return value.tqmaskWith(device().tqmask(type));
 }
 
 BitValue Pic::Memory::normalizedWord(MemoryRangeType type, uint offset) const
@@ -96,24 +96,24 @@ void Pic::Memory::setArray(MemoryRangeType type, const Device::Array &data)
   _ranges[type] = data;
 }
 
-QString Pic::Memory::findValue(const QString &maskName) const
+TQString Pic::Memory::findValue(const TQString &tqmaskName) const
 {
-  if ( maskName.isEmpty() ) return QString::null;
+  if ( tqmaskName.isEmpty() ) return TQString();
   uint i;
-  const Config::Mask *mask = device().config().findMask(maskName, &i);
-  if ( mask==0 ) return QString::null;
-  BitValue v = word(MemoryRangeType::Config, i).maskWith(mask->value);
-  for (uint k=0; k<uint(mask->values.count()); k++)
-    if ( v.isInside(mask->values[k].value) ) return mask->values[k].name;
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName, &i);
+  if ( tqmask==0 ) return TQString();
+  BitValue v = word(MemoryRangeType::Config, i).tqmaskWith(tqmask->value);
+  for (uint k=0; k<uint(tqmask->values.count()); k++)
+    if ( v.isInside(tqmask->values[k].value) ) return tqmask->values[k].name;
   Q_ASSERT(false);
-  return QString::null;
+  return TQString();
 }
 
 AddressRange Pic::Memory::bootRange() const
 {
   const Protection &protection = device().config().protection();
   // with boot size
-  QString value = findValue(protection.bootSizeMaskName());
+  TQString value = findValue(protection.bootSizeMaskName());
   if ( !value.isEmpty() ) {
     uint size = value.toUInt();
     if ( size==0 ) return AddressRange();
@@ -122,10 +122,10 @@ AddressRange Pic::Memory::bootRange() const
     return AddressRange(start, 2 * size - 1); // instruction words
   }
   // only CPB
-  QString maskName = protection.bootMaskName(Protection::ProgramProtected);
-  const Config::Mask *mask = device().config().findMask(maskName);
-  for (uint k=0; k<uint(mask->values.count()); k++) {
-    AddressRangeVector rv = protection.extractRanges(mask->values[k].name, MemoryRangeType::Code);
+  TQString tqmaskName = protection.bootMaskName(Protection::ProgramProtected);
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName);
+  for (uint k=0; k<uint(tqmask->values.count()); k++) {
+    AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code);
     if ( !rv.isEmpty() ) return rv[0];
   }
   Q_ASSERT(false);
@@ -142,9 +142,9 @@ AddressRange Pic::Memory::blockRange(uint i) const
     Address start = (previous.isEmpty() ? device().range(MemoryRangeType::Code).start : previous.end + 1);
     return AddressRange(start, device().range(MemoryRangeType::Code).end);
   }
-  QString maskName = protection.blockSizeMaskName(i);
+  TQString tqmaskName = protection.blockSizeMaskName(i);
   if ( protection.family()==Protection::CodeGuard ) { // secure segment
-    QString value = findValue(maskName);
+    TQString value = findValue(tqmaskName);
     Q_ASSERT( !value.isEmpty() );
     uint size = value.toUInt();
     if ( size==0 ) return AddressRange();
@@ -153,9 +153,9 @@ AddressRange Pic::Memory::blockRange(uint i) const
     return AddressRange(start, 2 * size - 1);
   }
   AddressRange previous = (i==0 ? bootRange() : blockRange(i-1));
-  const Config::Mask *mask = device().config().findMask(maskName);
-  for (uint k=0; k<uint(mask->values.count()); k++) {
-    AddressRangeVector rv = protection.extractRanges(mask->values[k].name, MemoryRangeType::Code);
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName);
+  for (uint k=0; k<uint(tqmask->values.count()); k++) {
+    AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code);
     if ( !rv.isEmpty() ) return AddressRange(previous.end + 1, rv[0].end);
   }
   Q_ASSERT(false);
@@ -165,8 +165,8 @@ AddressRange Pic::Memory::blockRange(uint i) const
 AddressRange Pic::Memory::bootProtectedRange(Protection::Type ptype) const
 {
   const Protection &protection = device().config().protection();
-  QString maskName = protection.bootMaskName(ptype);
-  QString value = findValue(maskName);
+  TQString tqmaskName = protection.bootMaskName(ptype);
+  TQString value = findValue(tqmaskName);
   if ( value.isEmpty() ) return AddressRange();
   if ( protection.family()!=Protection::CodeGuard ) {
     if ( protection.extractRanges(value, MemoryRangeType::Code).isEmpty() ) return AddressRange();
@@ -179,8 +179,8 @@ AddressRange Pic::Memory::bootProtectedRange(Protection::Type ptype) const
 AddressRange Pic::Memory::blockProtectedRange(Protection::Type ptype, uint i) const
 {
   const Protection &protection = device().config().protection();
-  QString maskName = protection.blockMaskName(ptype, i);
-  QString value = findValue(maskName);
+  TQString tqmaskName = protection.blockMaskName(ptype, i);
+  TQString value = findValue(tqmaskName);
   if ( value.isEmpty() ) return AddressRange();
   if ( protection.family()!=Protection::CodeGuard ) {
     if ( protection.extractRanges(value, MemoryRangeType::Code).isEmpty() ) return AddressRange();
@@ -202,9 +202,9 @@ AddressRangeVector Pic::Memory::protectedRanges(Protection::Type ptype, MemoryRa
     }
   }
   if ( protection.family()!=Protection::CodeGuard ) {
-    QString maskName = protection.maskName(ptype, type);
-    QString value = findValue(maskName);
-    //qDebug("%s %s", maskName.latin1(), value.latin1());
+    TQString tqmaskName = protection.tqmaskName(ptype, type);
+    TQString value = findValue(tqmaskName);
+    //qDebug("%s %s", tqmaskName.latin1(), value.latin1());
     if ( !value.isEmpty() ) {
       AddressRangeVector tmp = protection.extractRanges(value, type);
       Q_ASSERT( tmp.count()==1 );
@@ -216,14 +216,14 @@ AddressRangeVector Pic::Memory::protectedRanges(Protection::Type ptype, MemoryRa
 
 void Pic::Memory::setBootProtection(bool on, Protection::Type ptype)
 {
-  QString maskName = device().config().protection().bootMaskName(ptype);
-  setProtection(on, maskName, ptype);
+  TQString tqmaskName = device().config().protection().bootMaskName(ptype);
+  setProtection(on, tqmaskName, ptype);
 }
 
 void Pic::Memory::setBlockProtection(bool on, Protection::Type ptype, uint block)
 {
-  QString maskName = device().config().protection().blockMaskName(ptype, block);
-  setProtection(on, maskName, ptype);
+  TQString tqmaskName = device().config().protection().blockMaskName(ptype, block);
+  setProtection(on, tqmaskName, ptype);
 }
 
 void Pic::Memory::setProtection(bool on, Protection::Type ptype, MemoryRangeType type)
@@ -236,57 +236,57 @@ void Pic::Memory::setProtection(bool on, Protection::Type ptype, MemoryRangeType
       return;
     }
   }
-  setProtection(on, protection.maskName(ptype, type), ptype);
+  setProtection(on, protection.tqmaskName(ptype, type), ptype);
 }
 
-void Pic::Memory::setConfigValue(const QString &maskName, const QString &valueName)
+void Pic::Memory::setConfigValue(const TQString &tqmaskName, const TQString &valueName)
 {
   uint i;
-  const Config::Mask *mask = device().config().findMask(maskName, &i);
-  Q_ASSERT(mask);
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName, &i);
+  Q_ASSERT(tqmask);
   BitValue v = word(MemoryRangeType::Config, i);
-  v = v.clearMaskBits(mask->value);
-  for (int k=mask->values.count()-1; k>=0; k--) { // important to get the highest value in case of identical values
-    if ( mask->values[k].name!=valueName ) continue;
-    setWord(MemoryRangeType::Config, i, v | mask->values[k].value);
+  v = v.clearMaskBits(tqmask->value);
+  for (int k=tqmask->values.count()-1; k>=0; k--) { // important to get the highest value in case of identical values
+    if ( tqmask->values[k].name!=valueName ) continue;
+    setWord(MemoryRangeType::Config, i, v | tqmask->values[k].value);
     return;
   }
   Q_ASSERT(false);
 }
 
-void Pic::Memory::setProtection(bool on, const QString &maskName, Protection::Type ptype)
+void Pic::Memory::setProtection(bool on, const TQString &tqmaskName, Protection::Type ptype)
 {
-  const Config::Mask *mask = device().config().findMask(maskName, 0);
-  if( mask==0 ) return;
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+  if( tqmask==0 ) return;
   const Protection &protection = device().config().protection();
-  QString valueName;
+  TQString valueName;
   if ( ptype==Protection::StandardSecurity || ptype==Protection::HighSecurity )
     valueName = protection.securityValueName(ptype);
   else {
-    for (int k=mask->values.count()-1; k>=0; k--) {
-      if ( (on && protection.isAllProtectedValueName(mask->values[k].name))
-           || (!on && protection.isNoneProtectedValueName(mask->values[k].name)) ) valueName = mask->values[k].name;
+    for (int k=tqmask->values.count()-1; k>=0; k--) {
+      if ( (on && protection.isAllProtectedValueName(tqmask->values[k].name))
+           || (!on && protection.isNoneProtectedValueName(tqmask->values[k].name)) ) valueName = tqmask->values[k].name;
     }
   }
-  setConfigValue(maskName, valueName);
+  setConfigValue(tqmaskName, valueName);
 }
 
-bool Pic::Memory::hasFlagOn(const QString &maskName, bool valueIfNotPresent) const
+bool Pic::Memory::hasFlagOn(const TQString &tqmaskName, bool valueIfNotPresent) const
 {
-  const Config::Mask *mask = device().config().findMask(maskName, 0);
-  if ( mask==0 ) return valueIfNotPresent;
-  Q_ASSERT(mask);
-  Q_ASSERT( mask->values.count()==2 );
-  return ( findValue(maskName)=="On" );
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+  if ( tqmask==0 ) return valueIfNotPresent;
+  Q_ASSERT(tqmask);
+  Q_ASSERT( tqmask->values.count()==2 );
+  return ( findValue(tqmaskName)=="On" );
 }
 
-void Pic::Memory::setFlagOn(const QString &maskName, bool on)
+void Pic::Memory::setFlagOn(const TQString &tqmaskName, bool on)
 {
-  const Config::Mask *mask = device().config().findMask(maskName, 0);
-  Q_UNUSED(mask);
-  Q_ASSERT(mask);
-  Q_ASSERT( mask->values.count()==2 );
-  setConfigValue(maskName, on ? "On" : "Off");
+  const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+  Q_UNUSED(tqmask);
+  Q_ASSERT(tqmask);
+  Q_ASSERT( tqmask->values.count()==2 );
+  setConfigValue(tqmaskName, on ? "On" : "Off");
 }
 
 void Pic::Memory::checksumCheckFill()
@@ -331,12 +331,12 @@ void Pic::Memory::checksumCheckFill()
 BitValue Pic::Memory::checksum() const
 {
   // code
-  BitValue mask = device().mask(MemoryRangeType::Code);
+  BitValue tqmask = device().tqmask(MemoryRangeType::Code);
   AddressRangeVector rv = protectedRanges(Protection::ProgramProtected, MemoryRangeType::Code);
   bool isProtected = !rv.isEmpty();
   uint inc = device().addressIncrement(MemoryRangeType::Code);
   //uint nbChars = device().nbCharsWord(MemoryRangeType::Code);
-  //qDebug("protected: %i  nb: %s (%s)", isProtected, toHexLabelAbs(inc*device().nbWords(MemoryRangeType::Code)).latin1(), toHexLabel(mask, nbChars).latin1());
+  //qDebug("protected: %i  nb: %s (%s)", isProtected, toHexLabelAbs(inc*device().nbWords(MemoryRangeType::Code)).latin1(), toHexLabel(tqmask, nbChars).latin1());
   //for (uint i=0; i<rv.count(); i++)
   //  qDebug("protected: %s:%s", toHex(rv[i].start, nbChars).latin1(), toHex(rv[i].end, nbChars).latin1());
   if ( isProtected && (device().architecture()==Pic::Architecture::P18J || device().architecture()==Pic::Architecture::P24F) )
@@ -345,10 +345,10 @@ BitValue Pic::Memory::checksum() const
   BitValue cs = 0x0000;
   const Protection &protection = device().config().protection();
   if ( protection.family()==Protection::BasicProtection ) {
-    QString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
-    QString valueName = findValue(maskName);
-    const QMap<QString, Checksum::Data> &checksums = device().checksums();
-    if ( checksums.contains(valueName) ) { // #### REMOVE ME !!
+    TQString tqmaskName = protection.tqmaskName(Protection::ProgramProtected, MemoryRangeType::Code);
+    TQString valueName = findValue(tqmaskName);
+    const TQMap<TQString, Checksum::Data> &checksums = device().checksums();
+    if ( checksums.tqcontains(valueName) ) { // #### REMOVE ME !!
       algorithm = checksums[valueName].algorithm;
       cs = checksums[valueName].constant;
     }
@@ -356,14 +356,14 @@ BitValue Pic::Memory::checksum() const
   //qDebug("constant: %s", toHexLabelAbs(cs).data());
   //qDebug("algo: %s", Checksum::ALGORITHM_DATA[algorithm].name);
   for (uint i=0; i<device().nbWords(MemoryRangeType::Code); i++) {
-    if ( algorithm==Checksum::Algorithm::Normal && rv.contains(inc*i) ) continue;
-    BitValue v = word(MemoryRangeType::Code, i).maskWith(mask);
+    if ( algorithm==Checksum::Algorithm::Normal && rv.tqcontains(inc*i) ) continue;
+    BitValue v = word(MemoryRangeType::Code, i).tqmaskWith(tqmask);
     //if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1());
     switch (device().architecture().type()) {
       case Architecture::P10X:
       case Architecture::P16X:
       case Architecture::P17C:
-        if ( rv.contains(i) ) {
+        if ( rv.tqcontains(i) ) {
           switch (algorithm.type()) {
             case Checksum::Algorithm::Normal: cs += v;           break;
             case Checksum::Algorithm::XOR4:   cs += v.XORn(4);  break;
@@ -392,9 +392,9 @@ BitValue Pic::Memory::checksum() const
   const Config &config = device().config();
   for (uint i=0; i<uint(config._words.count()); i++) {
     const Config::Word &cword = config._words[i];
-    BitValue v = word(MemoryRangeType::Config, i).maskWith(cword.cmask);
+    BitValue v = word(MemoryRangeType::Config, i).tqmaskWith(cword.ctqmask);
     //uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
-    // qDebug("%i: %s %s", i, toHex(word(MemoryRangeType::Config, i), nbChars).latin1(), toHex(cword.cmask, nbChars).latin1());
+    // qDebug("%i: %s %s", i, toHex(word(MemoryRangeType::Config, i), nbChars).latin1(), toHex(cword.ctqmask, nbChars).latin1());
     if ( ( device().name()=="16C61" || device().name()=="16C71" ) && isProtected ) cs += v | 0x0060;
     else if ( device().is16bitFamily() ) cs += v.byte(0) + v.byte(1);
     else cs += v;
@@ -405,7 +405,7 @@ BitValue Pic::Memory::checksum() const
     BitValue id = 0x0;
     uint nb = device().nbWords(MemoryRangeType::UserId);
     for (uint i=0; i<nb; i++) {
-      BitValue v = word(MemoryRangeType::UserId, nb-i-1).maskWith(0xF);
+      BitValue v = word(MemoryRangeType::UserId, nb-i-1).tqmaskWith(0xF);
       if ( device().is18Family() ) id += v;
       else {
         // qDebug("id %i (%i): %s %s", i, nbb, toHex(v, 4).latin1(), toHex(v << (nbb*i), 9).latin1());
@@ -416,7 +416,7 @@ BitValue Pic::Memory::checksum() const
     cs += id;
   }
   //qDebug("checksum: %s %s", toHexLabelAbs(cs).latin1(), toHex(cs & 0xFFFF, 4).latin1());
-  return cs.maskWith(0xFFFF);
+  return cs.tqmaskWith(0xFFFF);
 }
 
 BitValue Pic::Memory::unprotectedChecksum() const
@@ -442,7 +442,7 @@ void Pic::Memory::setUserIdToUnprotectedChecksum()
 }
 
 //-----------------------------------------------------------------------------
-void Pic::Memory::savePartial(QTextStream &stream, HexBuffer::Format format) const
+void Pic::Memory::savePartial(TQTextStream &stream, HexBuffer::Format format) const
 {
   // save memory ranges in the same order as MPLAB (for easy checking)
   const MemoryRangeType saveOrder[] = { MemoryRangeType::Code, MemoryRangeType::Eeprom, MemoryRangeType::Config, MemoryRangeType::UserId, MemoryRangeType::Cal, MemoryRangeType::Nb_Types };
@@ -462,7 +462,7 @@ void Pic::Memory::toHexBuffer(MemoryRangeType type, HexBuffer &hb) const
   bool packed = device().architecture().data().packed;
   uint offset = device().range(type).hexFileOffset;
   if ( offset==0 ) offset = device().range(type).start.toUInt();
-  BitValue mask = device().mask(type);
+  BitValue tqmask = device().tqmask(type);
   uint wNbBytes = nbBytes;
   if ( packed && type!=Pic::MemoryRangeType::Code ) {
     offset /= 2;
@@ -474,7 +474,7 @@ void Pic::Memory::toHexBuffer(MemoryRangeType type, HexBuffer &hb) const
   //qDebug("%s wnb=%i snb=%i div=%i", MEMORY_RANGE_TYPE_DATA[type].label, wNbBytes, sNbBytes, div);
   for (uint k=0; k<wNbBytes*device().nbWords(type); k++) {
     // set byte
-    BitValue s = _ranges[type][wOffset].maskWith(mask);
+    BitValue s = _ranges[type][wOffset].tqmaskWith(tqmask);
     //if ( k<4 ) qDebug("s=%s so=%s sb=%i wo=%i wb=%i", toHex(s, 8).data(), toHex(sOffset, 8).data(), sByte, wOffset, wByte);
     s = s.byte(wByte);
     if ( (byte%2)==0 ) hb.insert(offset, s);
@@ -501,14 +501,14 @@ HexBuffer Pic::Memory::toHexBuffer() const
 }
 
 void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, WarningTypes &result,
-                                QStringList &warnings, QMap<uint, bool> &inRange)
+                                TQStringList &warnings, TQMap<uint, bool> &inRange)
 {
   if ( !device().isWritable(type) ) return;
   uint nbBytes = device().architecture().data().nbBytesWord;
   bool packed = device().architecture().data().packed;
   uint offset = device().range(type).hexFileOffset;
   if ( offset==0 ) offset = device().range(type).start.toUInt();
-  BitValue mask = device().mask(type);
+  BitValue tqmask = device().tqmask(type);
   uint wNbBytes = nbBytes;
   if ( packed && type!=Pic::MemoryRangeType::Code ) {
     offset /= 2;
@@ -523,7 +523,7 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni
     BitValue s = hb[offset];
     //if ( k<4 ) qDebug("s=%s so=%s sb=%i wo=%i wb=%i", toHex(s, 8).data(), toHex(offset, 8).data(), byte, wOffset, wByte);
     if ( !s.isInitialized() ) {
-      if ( type==MemoryRangeType::Config ) _ranges[type][wOffset] = mask;
+      if ( type==MemoryRangeType::Config ) _ranges[type][wOffset] = tqmask;
       else _ranges[type][wOffset] = BitValue();
     } else {
       inRange[offset] = true;
@@ -540,12 +540,12 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni
     wByte++;
     if ( (wByte%wNbBytes)==0 ) {
       if ( _ranges[type][wOffset].isInitialized() ) {
-        if ( !(result & ValueTooLarge) && _ranges[type][wOffset].maskWith(mask)!=_ranges[type][wOffset] ) {
+        if ( !(result & ValueTooLarge) && _ranges[type][wOffset].tqmaskWith(tqmask)!=_ranges[type][wOffset] ) {
           result |= ValueTooLarge;
-          warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).")
-                      .arg(toHexLabel(offset, 8)).arg(toHexLabel(_ranges[type][wOffset], 8)).arg(toHexLabel(mask, 8));
+          warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).")
+                      .tqarg(toHexLabel(offset, 8)).tqarg(toHexLabel(_ranges[type][wOffset], 8)).tqarg(toHexLabel(tqmask, 8));
         }
-        _ranges[type][wOffset] = _ranges[type][wOffset].maskWith(mask);
+        _ranges[type][wOffset] = _ranges[type][wOffset].tqmaskWith(tqmask);
       }
       wByte = 0;
       wOffset++;
@@ -554,7 +554,7 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni
 }
 
 void Pic::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result,
-                                QStringList &warnings, QMap<uint, bool> &inRange)
+                                TQStringList &warnings, TQMap<uint, bool> &inRange)
 {
   FOR_EACH(MemoryRangeType, i) fromHexBuffer(i, hb, result, warnings, inRange);
 }
diff --git a/src/devices/pic/pic/pic_memory.h b/src/devices/pic/pic/pic_memory.h
index f7c98ba..7d00c01 100644
--- a/src/devices/pic/pic/pic_memory.h
+++ b/src/devices/pic/pic/pic_memory.h
@@ -41,7 +41,7 @@ public:
   bool isBlockProtected(Protection::Type ptype, uint i) const { return !blockProtectedRange(ptype, i).isEmpty(); }
   bool isProtected(Protection::Type ptype, MemoryRangeType type) const { return !protectedRanges(ptype, type).isEmpty(); }
   AddressRangeVector protectedRanges(Protection::Type ptype, MemoryRangeType type) const;
-  void setConfigValue(const QString &maskName, const QString &valueName);
+  void setConfigValue(const TQString &tqmaskName, const TQString &valueName);
   bool hasDebugOn() const { return hasFlagOn("DEBUG", false); }
   void setDebugOn(bool on) { setFlagOn("DEBUG", on); }
   bool hasWatchdogTimerOn() const { return hasFlagOn("WDT", false); }
@@ -58,19 +58,19 @@ public:
   virtual void copyFrom(const Device::Memory &memory);
   void copyFrom(MemoryRangeType type, const Memory &memory);
   void fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, WarningTypes &warningTypes,
-                     QStringList &warnings, QMap<uint, bool> &inRange);
+                     TQStringList &warnings, TQMap<uint, bool> &inRange);
 
 private:
-  QMap<MemoryRangeType, Device::Array> _ranges;
+  TQMap<MemoryRangeType, Device::Array> _ranges;
 
   void toHexBuffer(MemoryRangeType type, HexBuffer &hb) const;
-  virtual void savePartial(QTextStream &stream, HexBuffer::Format format) const;
+  virtual void savePartial(TQTextStream &stream, HexBuffer::Format format) const;
   virtual void fromHexBuffer(const HexBuffer &hb, WarningTypes &warningTypes,
-                             QStringList &warnings, QMap<uint, bool> &inRange);
-  QString findValue(const QString &maskName) const;
-  bool hasFlagOn(const QString &maskName, bool valueIfNotPresent) const;
-  void setFlagOn(const QString &maskName, bool on);
-  void setProtection(bool on, const QString &maskName, Protection::Type ptype);
+                             TQStringList &warnings, TQMap<uint, bool> &inRange);
+  TQString findValue(const TQString &tqmaskName) const;
+  bool hasFlagOn(const TQString &tqmaskName, bool valueIfNotPresent) const;
+  void setFlagOn(const TQString &tqmaskName, bool on);
+  void setProtection(bool on, const TQString &tqmaskName, Protection::Type ptype);
   AddressRange bootProtectedRange(Protection::Type ptype) const;
   AddressRange blockProtectedRange(Protection::Type ptype, uint block) const;
 };
diff --git a/src/devices/pic/prog/pic_debug.cpp b/src/devices/pic/prog/pic_debug.cpp
index 443bb10..ebdcd75 100644
--- a/src/devices/pic/prog/pic_debug.cpp
+++ b/src/devices/pic/prog/pic_debug.cpp
@@ -13,14 +13,14 @@
 #include "progs/manager/debug_manager.h"
 
 //----------------------------------------------------------------------------
-Register::TypeData Debugger::PicBase::registerTypeData(const QString &name) const
+Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) const
 {
   const Pic::RegistersData &rdata = device()->registersData();
-  Q_ASSERT(rdata.sfrs.contains(name));
+  Q_ASSERT(rdata.sfrs.tqcontains(name));
   return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars());
 }
 
-bool Debugger::PicBase::updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits)
+bool Debugger::PicBase::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
 {
   const Pic::RegistersData &rdata = device()->registersData();
   BitValue tris;
@@ -65,7 +65,7 @@ const Debugger::PicBase &Debugger::PicSpecific::base() const
   return static_cast<PicBase &>(_base);
 }
 
-bool Debugger::PicSpecific::updateStatus()
+bool Debugger::PicSpecific::updatetqStatus()
 {
   if ( !Debugger::manager->readRegister(base().pcTypeData()) ) return false;
   if ( !Debugger::manager->readRegister(base().registerTypeData("STATUS")) ) return false;
@@ -79,22 +79,22 @@ Register::TypeData Debugger::P16FSpecific::wregTypeData() const
   return Register::TypeData("WREG", device().registersData().nbChars());
 }
 
-QString Debugger::P16FSpecific::statusString() const
+TQString Debugger::P16FSpecific::statusString() const
 {
   const Pic::RegistersData &rdata = device().registersData();
   BitValue status = Register::list().value(base().registerTypeData("STATUS"));
   uint bank = (status.bit(5) ? 1 : 0) + (status.bit(6) ? 2 : 0);
   BitValue wreg = Register::list().value(wregTypeData());
-  return QString("W:%1   %2 %3 %4   PC:%5   Bank:%6")
-         .arg(toHexLabel(wreg, rdata.nbChars())).arg(status.bit(2) ? "Z" : "z")
-         .arg(status.bit(1) ? "DC" : "dc").arg(status.bit(0) ? "C" : "c")
-         .arg(toHexLabel(_base.pc(), device().nbCharsAddress())).arg(bank);
+  return TQString("W:%1   %2 %3 %4   PC:%5   Bank:%6")
+         .tqarg(toHexLabel(wreg, rdata.nbChars())).tqarg(status.bit(2) ? "Z" : "z")
+         .tqarg(status.bit(1) ? "DC" : "dc").tqarg(status.bit(0) ? "C" : "c")
+         .tqarg(toHexLabel(_base.pc(), device().nbCharsAddress())).tqarg(bank);
 }
 
 //----------------------------------------------------------------------------
-bool Debugger::P18FSpecific::updateStatus()
+bool Debugger::P18FSpecific::updatetqStatus()
 {
-  if ( !PicSpecific::updateStatus() ) return false;
+  if ( !PicSpecific::updatetqStatus() ) return false;
   if ( !Debugger::manager->readRegister(base().registerTypeData("BSR")) ) return false;
   return true;
 }
@@ -104,15 +104,15 @@ Register::TypeData Debugger::P18FSpecific::wregTypeData() const
   return base().registerTypeData("WREG");
 }
 
-QString Debugger::P18FSpecific::statusString() const
+TQString Debugger::P18FSpecific::statusString() const
 {
   const Pic::RegistersData &rdata = device().registersData();
   BitValue status = Register::list().value(base().registerTypeData("STATUS"));
   BitValue bsr = Register::list().value(base().registerTypeData("BSR"));
   BitValue wreg = Register::list().value(wregTypeData());
-  return QString("W:%1   %2 %3 %4 %5 %6  PC:%7   Bank:%8")
-         .arg(toHexLabel(wreg, rdata.nbChars())).arg(status.bit(4) ? "N" : "n")
-         .arg(status.bit(3) ? "OV" : "ov").arg(status.bit(2) ? "Z" : "z")
-         .arg(status.bit(1) ? "DC" : "dc").arg(status.bit(0) ? "C" : "c")
-         .arg(toHexLabel(base().pc(), device().nbCharsAddress())).arg(toLabel(bsr));
+  return TQString("W:%1   %2 %3 %4 %5 %6  PC:%7   Bank:%8")
+         .tqarg(toHexLabel(wreg, rdata.nbChars())).tqarg(status.bit(4) ? "N" : "n")
+         .tqarg(status.bit(3) ? "OV" : "ov").tqarg(status.bit(2) ? "Z" : "z")
+         .tqarg(status.bit(1) ? "DC" : "dc").tqarg(status.bit(0) ? "C" : "c")
+         .tqarg(toHexLabel(base().pc(), device().nbCharsAddress())).tqarg(toLabel(bsr));
 }
diff --git a/src/devices/pic/prog/pic_debug.h b/src/devices/pic/prog/pic_debug.h
index dfb8af6..ce08387 100644
--- a/src/devices/pic/prog/pic_debug.h
+++ b/src/devices/pic/prog/pic_debug.h
@@ -25,7 +25,7 @@ public:
   const Pic::Data &device() const { return static_cast<const Pic::Data &>(*_base.device()); }
   PicBase &base();
   const PicBase &base() const;
-  virtual bool updateStatus();
+  virtual bool updatetqStatus();
   virtual Register::TypeData wregTypeData() const = 0;
 };
 
@@ -34,7 +34,7 @@ class P16FSpecific : public PicSpecific
 {
 public:
   P16FSpecific(Debugger::Base &base) : PicSpecific(base) {}
-  virtual QString statusString() const;
+  virtual TQString statusString() const;
   virtual Register::TypeData wregTypeData() const;
 };
 
@@ -43,8 +43,8 @@ class P18FSpecific : public PicSpecific
 {
 public:
   P18FSpecific(Debugger::Base &base) : PicSpecific(base) {}
-  virtual QString statusString() const;
-  virtual bool updateStatus();
+  virtual TQString statusString() const;
+  virtual bool updatetqStatus();
   virtual Register::TypeData wregTypeData() const;
 };
 
@@ -56,8 +56,8 @@ public:
   PicSpecific *deviceSpecific() { return static_cast<PicSpecific *>(_deviceSpecific); }
   const PicSpecific *deviceSpecific() const { return static_cast<const PicSpecific *>(_deviceSpecific); }
   const Pic::Data *device() const { return static_cast<const Pic::Data *>(Debugger::Base::device()); }
-  Register::TypeData registerTypeData(const QString &name) const;
-  virtual bool updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits);
+  Register::TypeData registerTypeData(const TQString &name) const;
+  virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits);
 };
 
 } // namespace
diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp
index bc7dcd1..e882529 100644
--- a/src/devices/pic/prog/pic_prog.cpp
+++ b/src/devices/pic/prog/pic_prog.cpp
@@ -79,7 +79,7 @@ uint Programmer::PicBase::nbSteps(Task task, const Device::MemoryRange *range) c
         if ( !prange->all() && prange->_type!=type ) continue;
         nb += device()->nbWords(type);
       }
-      return QMAX(nb, uint(1));
+      return TQMAX(nb, uint(1));
     }
     case Task::Write: {
       uint nb = 0;
@@ -90,7 +90,7 @@ uint Programmer::PicBase::nbSteps(Task task, const Device::MemoryRange *range) c
         nb += device()->nbWords(type);
         if ( readConfigEntry(Config::VerifyAfterProgram).toBool() ) nb += device()->nbWords(type);
       }
-      return QMAX(nb, uint(1));
+      return TQMAX(nb, uint(1));
     }
     case Task::Nb_Types: break;
   }
@@ -106,9 +106,9 @@ bool Programmer::PicBase::readVoltages()
     if ( !group().canReadVoltage(Pic::VoltageType(i)) ) continue;
     if ( _voltages[i].error==true ) {
       ok = false;
-      log(Log::LineType::Error, i18n("  %1 = %2 V: error in voltage level.").arg(i18n(Pic::VOLTAGE_TYPE_LABELS[i])).arg(_voltages[i].value));
+      log(Log::LineType::Error, i18n("  %1 = %2 V: error in voltage level.").tqarg(i18n(Pic::VOLTAGE_TYPE_LABELS[i])).tqarg(_voltages[i].value));
     } else if ( _voltages[i].value!=UNKNOWN_VOLTAGE )
-      log(Log::DebugLevel::Normal, QString("  %1 = %2 V").arg(i18n(Pic::VOLTAGE_TYPE_LABELS[i])).arg(_voltages[i].value));
+      log(Log::DebugLevel::Normal, TQString("  %1 = %2 V").tqarg(i18n(Pic::VOLTAGE_TYPE_LABELS[i])).tqarg(_voltages[i].value));
   }
   return ok;
 }
@@ -136,10 +136,10 @@ bool Programmer::PicBase::initProgramming(Task)
     const Pic::VoltageData &tvpp = device()->voltage(Pic::Vpp);
     if ( vpp()<tvpp.min )
       log(Log::LineType::Warning, i18n("Vpp (%1 V) is lower than the minimum required voltage (%2 V).")
-                        .arg(vpp()).arg(tvpp.min));
+                        .tqarg(vpp()).tqarg(tvpp.min));
     if ( vpp()>tvpp.max ) {
-      QString s = i18n("Vpp (%1 V) is higher than the maximum voltage (%2 V). You may damage the device.")
-                  .arg(vpp()).arg(tvpp.max);
+      TQString s = i18n("Vpp (%1 V) is higher than the maximum voltage (%2 V). You may damage the device.")
+                  .tqarg(vpp()).tqarg(tvpp.max);
       log(Log::LineType::Warning, s);
       if ( !askContinue(s) ) {
         logUserAbort();
@@ -153,15 +153,15 @@ bool Programmer::PicBase::initProgramming(Task)
     if ( vdd()<tvdd.min ) {
       if ( type==Pic::VddBulkErase && device()->voltage(Pic::VddWrite).min!=tvdd.min )
         log(Log::LineType::Warning, i18n("Vdd (%1 V) is too low for high-voltage programming\n(piklab only supports high-voltage programming at the moment).\nMinimum required is %2 V.")
-                          .arg(vdd()).arg(tvdd.min));
+                          .tqarg(vdd()).tqarg(tvdd.min));
       else if ( type==Pic::VddRead && device()->voltage(Pic::VddWrite).min!=tvdd.min )
         log(Log::LineType::Warning, i18n("Vdd (%1 V) is too low for reading\nMinimum required is %2 V.")
-                          .arg(vdd()).arg(tvdd.min));
+                          .tqarg(vdd()).tqarg(tvdd.min));
       else log(Log::LineType::Warning, i18n("Vdd (%1 V) is too low for programming\nMinimum required is %2 V.")
-                            .arg(vdd()).arg(tvdd.min));
+                            .tqarg(vdd()).tqarg(tvdd.min));
     } else if ( vdd()>tvdd.max ) {
-      QString s = i18n("Vdd (%1 V) is higher than the maximum voltage (%2 V). You may damage the device.")
-                  .arg(vdd()).arg(tvdd.max);
+      TQString s = i18n("Vdd (%1 V) is higher than the maximum voltage (%2 V). You may damage the device.")
+                  .tqarg(vdd()).tqarg(tvdd.max);
       log(Log::LineType::Warning, s);
       if ( !askContinue(s) ) {
         logUserAbort();
@@ -177,8 +177,8 @@ bool Programmer::PicBase::initProgramming(Task)
     _deviceMemory->setArray(Pic::MemoryRangeType::Config, data);
     _hasProtectedCode = _deviceMemory->isProtected(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code);
     _hasProtectedEeprom = _deviceMemory->isProtected(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Eeprom);
-    log(Log::DebugLevel::Normal, QString("  protected: code=%1 data=%2")
-                          .arg(_hasProtectedCode ? "true" : "false").arg(_hasProtectedEeprom ? "true" : "false"));
+    log(Log::DebugLevel::Normal, TQString("  protected: code=%1 data=%2")
+                          .tqarg(_hasProtectedCode ? "true" : "false").tqarg(_hasProtectedEeprom ? "true" : "false"));
     // read calibration
     if ( !readCalibration() ) return false;
   }
@@ -250,45 +250,45 @@ bool Programmer::PicBase::verifyDeviceId()
 {
   if ( !specific()->canReadRange(Pic::MemoryRangeType::DeviceId ) ) return true;
   if ( !device()->isReadable(Pic::MemoryRangeType::DeviceId) ) {
-    log(Log::LineType::Information, i18n("Device not autodetectable: continuing with the specified device name \"%1\"...").arg(device()->name()));
+    log(Log::LineType::Information, i18n("Device not autodetectable: continuing with the specified device name \"%1\"...").tqarg(device()->name()));
     return true;
   }
   BitValue rawId = readDeviceId();
   if ( hasError() ) return false;
   uint nbChars = device()->nbWords(Pic::MemoryRangeType::DeviceId) * device()->nbCharsWord(Pic::MemoryRangeType::DeviceId);
-  if ( rawId==0x0 || rawId==device()->mask(Pic::MemoryRangeType::DeviceId) ) {
-    log(Log::LineType::Error, i18n("Missing or incorrect device (Read id is %1).").arg(toHexLabel(rawId, nbChars)));
+  if ( rawId==0x0 || rawId==device()->tqmask(Pic::MemoryRangeType::DeviceId) ) {
+    log(Log::LineType::Error, i18n("Missing or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars)));
     return false;
   }
-  QMap<QString, Device::IdData> ids;
-  QValueVector<QString> names = group().supportedDevices();
+  TQMap<TQString, Device::IdData> ids;
+  TQValueVector<TQString> names = group().supportedDevices();
   for (uint k=0; k<uint(names.count()); k++) {
     const Pic::Data *data = static_cast<const Pic::Data *>(group().deviceData(names[k]).data);
     if ( data->architecture()!=device()->architecture() ) continue;
     Device::IdData idata;
     if ( data->matchId(rawId, idata) ) ids[names[k]] = idata;
     }
-  QString message;
+  TQString message;
   if ( ids.count()!=0 ) {
-    log(Log::LineType::Information, i18n("Read id: %1").arg(device()->idNames(ids).join("; ")));
-    if ( ids.contains(device()->name()) ) return true;
-    message = i18n("Read id does not match the specified device name \"%1\".").arg(device()->name());
+    log(Log::LineType::Information, i18n("Read id: %1").tqarg(device()->idNames(ids).join("; ")));
+    if ( ids.tqcontains(device()->name()) ) return true;
+    message = i18n("Read id does not match the specified device name \"%1\".").tqarg(device()->name());
   } else {
-    log(Log::LineType::Warning, i18n("  Unknown or incorrect device (Read id is %1).").arg(toHexLabel(rawId, nbChars)));
+    log(Log::LineType::Warning, i18n("  Unknown or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars)));
     message = i18n("Unknown device.");
   }
   if ( !askContinue(message) ) {
     logUserAbort();
     return false;
   }
-  log(Log::LineType::Information, i18n("Continue with the specified device name: \"%1\"...").arg(device()->name()));
+  log(Log::LineType::Information, i18n("Continue with the specified device name: \"%1\"...").tqarg(device()->name()));
   return true;
 }
 
 //-----------------------------------------------------------------------------
-QString Programmer::PicBase::prettyCalibration(const Device::Array &data) const
+TQString Programmer::PicBase::prettyCalibration(const Device::Array &data) const
 {
-  QString s;
+  TQString s;
   for (uint i=0; i<data.count(); i++) {
     if ( i!=0 ) s += ", ";
     s += toHexLabel(data[i], device()->nbCharsWord(Pic::MemoryRangeType::Cal));
@@ -306,8 +306,8 @@ bool Programmer::PicBase::readCalibration()
     Device::Array data;
     if ( !specific()->read(Pic::MemoryRangeType::Cal, data, 0) ) return false;
     _deviceMemory->setArray(Pic::MemoryRangeType::Cal, data);
-    log(Log::DebugLevel::Normal, QString("  Read osccal: %1").arg(prettyCalibration(data)));
-    QString message;
+    log(Log::DebugLevel::Normal, TQString("  Read osccal: %1").tqarg(prettyCalibration(data)));
+    TQString message;
     if ( !device()->checkCalibration(data, &message) ) log(Log::LineType::Warning, "  " + message);
     if ( device()->isReadable(Pic::MemoryRangeType::CalBackup) ) {
       if ( !specific()->canReadRange(Pic::MemoryRangeType::CalBackup) ) {
@@ -316,7 +316,7 @@ bool Programmer::PicBase::readCalibration()
       }
       if ( !specific()->read(Pic::MemoryRangeType::CalBackup, data, 0) ) return false;
       _deviceMemory->setArray(Pic::MemoryRangeType::CalBackup, data);
-      log(Log::DebugLevel::Normal, QString("  Read osccal backup: %1").arg(prettyCalibration(data)));
+      log(Log::DebugLevel::Normal, TQString("  Read osccal backup: %1").tqarg(prettyCalibration(data)));
       if ( !device()->checkCalibration(data, &message) ) log(Log::LineType::Warning, "  " + message);
     }
   }
@@ -366,22 +366,22 @@ bool Programmer::PicBase::restoreBandGapBits()
   if ( !specific()->canReadRange(Pic::MemoryRangeType::Config) ) return true;
   bool hasProtectedBits = false;
   for (uint i=0; i<device()->nbWords(Pic::MemoryRangeType::Config); i++)
-    if ( device()->config()._words[i].pmask!=0 ) hasProtectedBits = true;
+    if ( device()->config()._words[i].ptqmask!=0 ) hasProtectedBits = true;
   if ( !hasProtectedBits ) return true;
   Device::Array cdata;
   if ( !specific()->read(Pic::MemoryRangeType::Config, cdata, 0) ) return false;
   Device::Array data = _deviceMemory->arrayForWriting(Pic::MemoryRangeType::Config);
   for (uint i=0; i<cdata.count(); i++) {
-    BitValue pmask = device()->config()._words[i].pmask;
-    if ( pmask==0 ) continue;
-    cdata[i] = cdata[i].clearMaskBits(pmask);
-    cdata[i] |= data[i].maskWith(pmask);
+    BitValue ptqmask = device()->config()._words[i].ptqmask;
+    if ( ptqmask==0 ) continue;
+    cdata[i] = cdata[i].clearMaskBits(ptqmask);
+    cdata[i] |= data[i].tqmaskWith(ptqmask);
   }
   if ( !specific()->canWriteRange(Pic::MemoryRangeType::Config) ) {
     log(Log::LineType::Warning, i18n("Could not restore band gap bits because programmer does not support writing config bits."));
     return true;
   }
-  log(Log::DebugLevel::Normal, QString("  Write config with band gap bits: %2").arg(toHexLabel(cdata[0], device()->nbCharsWord(Pic::MemoryRangeType::Config))));
+  log(Log::DebugLevel::Normal, TQString("  Write config with band gap bits: %2").tqarg(toHexLabel(cdata[0], device()->nbCharsWord(Pic::MemoryRangeType::Config))));
   if ( !programRange(Pic::MemoryRangeType::Config, cdata) ) return false;
   if ( !specific()->read(Pic::MemoryRangeType::Config, data, 0) ) return false;
   if ( data==cdata ) log(Log::LineType::Information, i18n("  Band gap bits have been preserved."));
@@ -464,7 +464,7 @@ bool Programmer::PicBase::internalEraseRange(Pic::MemoryRangeType type)
     log(Log::LineType::SoftError, i18n("Cannot erase specified range because of programmer limitations."));
     return false;
   }
-  if ( !askContinue(i18n("%1: Erasing this range only is not supported with this programmer. This will erase the whole chip and restore the other memory ranges.").arg(type.label())) ) {
+  if ( !askContinue(i18n("%1: Erasing this range only is not supported with this programmer. This will erase the whole chip and restore the other memory ranges.").tqarg(type.label())) ) {
     logUserAbort();
     return false;
   }
@@ -497,19 +497,19 @@ bool Programmer::PicBase::readRange(Pic::MemoryRangeType type, Pic::Memory *memo
 {
   if ( !device()->isReadable(type) ) return true;
   if ( !specific()->canReadRange(type) ) {
-    log(Log::LineType::Information, i18n("The selected programmer cannot read %1: operation skipped.").arg(type.label()));
+    log(Log::LineType::Information, i18n("The selected programmer cannot read %1: operation skipped.").tqarg(type.label()));
     return true;
   }
   VerifyData *vdata = (vd ? new VerifyData(vd->actions, vd->memory) : 0);
   if (vdata) {
-    log(Log::LineType::Information, i18n("  Verify memory: %1").arg(type.label()));
+    log(Log::LineType::Information, i18n("  Verify memory: %1").tqarg(type.label()));
     if ( !(vdata->actions & IgnoreProtectedVerify) ) {
       vdata->protectedRanges = static_cast<const Pic::Memory &>(vdata->memory).protectedRanges(Pic::Protection::ProgramProtected, type);
       if ( !vdata->protectedRanges.isEmpty() ) log(Log::LineType::Warning, i18n("  Part of device memory is protected (in %1) and cannot be verified.")
-                                               .arg(type.label()));
+                                               .tqarg(type.label()));
     } else vdata->protectedRanges.clear();
   } else {
-    log(Log::LineType::Information, i18n("  Read memory: %1").arg(type.label()));
+    log(Log::LineType::Information, i18n("  Read memory: %1").tqarg(type.label()));
     CRASH_ASSERT(memory);
   }
   Device::Array data;
@@ -562,7 +562,7 @@ bool Programmer::PicBase::programSingle(Pic::MemoryRangeType type, const Pic::Me
 
 bool Programmer::PicBase::programRange(Pic::MemoryRangeType mtype, const Device::Array &data)
 {
-  log(Log::LineType::Information, i18n("  Write memory: %1").arg(mtype.label()));
+  log(Log::LineType::Information, i18n("  Write memory: %1").tqarg(mtype.label()));
   bool only = ( readConfigEntry(Config::OnlyProgramNonMask).toBool()
                 && (mtype==Pic::MemoryRangeType::Code || mtype==Pic::MemoryRangeType::Eeprom) );
   return specific()->write(mtype, data, !only);
@@ -670,17 +670,17 @@ bool Programmer::PicBase::internalProgram(const Device::Memory &memory, const De
 //-----------------------------------------------------------------------------
 bool Programmer::PicBase::checkProgramCalibration(const Device::Array &data)
 {
-  QString message, s = prettyCalibration(data);
+  TQString message, s = prettyCalibration(data);
   if ( !device()->checkCalibration(data, &message) ) {
-    sorry(i18n("The calibration word %1 is not valid.").arg(s), message);
+    sorry(i18n("The calibration word %1 is not valid.").tqarg(s), message);
     return false;
   }
-  return askContinue(i18n("Do you want to overwrite the device calibration with %1?").arg(s));
+  return askContinue(i18n("Do you want to overwrite the device calibration with %1?").tqarg(s));
 }
 
 bool Programmer::PicBase::tryProgramCalibration(const Device::Array &data, bool &success)
 {
-  log(Log::LineType::Information, i18n("  Write memory: %1").arg(Pic::MemoryRangeType(Pic::MemoryRangeType::Cal).label()));
+  log(Log::LineType::Information, i18n("  Write memory: %1").tqarg(Pic::MemoryRangeType(Pic::MemoryRangeType::Cal).label()));
   success = true;
   if ( !specific()->write(Pic::MemoryRangeType::Cal, data, true) ) return false;
   Device::Array read;
@@ -691,7 +691,7 @@ bool Programmer::PicBase::tryProgramCalibration(const Device::Array &data, bool
   if ( device()->isWritable(Pic::MemoryRangeType::CalBackup) ) {
     if ( !specific()->read(Pic::MemoryRangeType::CalBackup, read, 0) ) return false;
     if ( device()->checkCalibration(read) ) return true; // do not overwrite correct backup value
-    log(Log::LineType::Information, i18n("  Write memory: %1").arg(Pic::MemoryRangeType(Pic::MemoryRangeType::CalBackup).label()));
+    log(Log::LineType::Information, i18n("  Write memory: %1").tqarg(Pic::MemoryRangeType(Pic::MemoryRangeType::CalBackup).label()));
     if ( !specific()->write(Pic::MemoryRangeType::CalBackup, data, true) ) return false;
     if ( !specific()->read(Pic::MemoryRangeType::CalBackup, read, 0) ) return false;
     for (uint i=0; i<data.count(); i++)
diff --git a/src/devices/pic/prog/pic_prog.h b/src/devices/pic/prog/pic_prog.h
index 0fb37f7..a76913a 100644
--- a/src/devices/pic/prog/pic_prog.h
+++ b/src/devices/pic/prog/pic_prog.h
@@ -98,7 +98,7 @@ private:
   bool doProgramCalibration(const Device::Array &data);
   bool checkProgramCalibration(const Device::Array &data);
   bool internalProgramCalibration(const Device::Array &data);
-  QString prettyCalibration(const Device::Array &data) const;
+  TQString prettyCalibration(const Device::Array &data) const;
   bool tryProgramCalibration(const Device::Array &data, bool &success);
   bool preserveCode();
   bool preserveEeprom();
diff --git a/src/devices/pic/prog/pic_prog_specific.cpp b/src/devices/pic/prog/pic_prog_specific.cpp
index bfcd2fa..bca71b4 100644
--- a/src/devices/pic/prog/pic_prog_specific.cpp
+++ b/src/devices/pic/prog/pic_prog_specific.cpp
@@ -28,11 +28,11 @@ uint Programmer::PicDeviceSpecific::findNonMaskStart(Pic::MemoryRangeType type,
 {
   uint start = 0;
   for (; start<data.count(); start++)
-    if ( data[start]!=device().mask(type) ) break;
-  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, QString("start before align: %1").arg(start));
+    if ( data[start]!=device().tqmask(type) ) break;
+  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("start before align: %1").tqarg(start));
   uint align = device().nbWordsWriteAlignment(type);
   start -= start % align;
-  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, QString("start after align: %1 (align=%2)").arg(start).arg(align));
+  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("start after align: %1 (align=%2)").tqarg(start).tqarg(align));
   return start;
 }
 
@@ -40,11 +40,11 @@ uint Programmer::PicDeviceSpecific::findNonMaskEnd(Pic::MemoryRangeType type, co
 {
   uint end = data.count()-1;
   for (; end>0; end--)
-    if ( data[end]!=device().mask(type) ) break;
-  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, QString("end before align: %1").arg(end));
+    if ( data[end]!=device().tqmask(type) ) break;
+  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("end before align: %1").tqarg(end));
   uint align = device().nbWordsWriteAlignment(type);
   if ( (end+1) % align ) end += align - (end+1) % align;
-  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, QString("end after align: %1 (align=%2)").arg(end).arg(align));
+  const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("end after align: %1 (align=%2)").tqarg(end).tqarg(align));
   Q_ASSERT(end<data.count());
   return end;
 }
@@ -99,23 +99,23 @@ bool Programmer::PicHardware::compareWords(Pic::MemoryRangeType type, uint index
   Address address = device().range(type).start + inc * index;
   if ( actions & ::Programmer::BlankCheckVerify )
     log(Log::LineType::SoftError, i18n("Device memory is not blank (in %1 at address %2: reading %3 and expecting %4).")
-      .arg(type.label()).arg(toHexLabel(address, device().nbCharsAddress()))
-      .arg(toHexLabel(d, device().nbCharsWord(type))).arg(toHexLabel(v, device().nbCharsWord(type))));
+      .tqarg(type.label()).tqarg(toHexLabel(address, device().nbCharsAddress()))
+      .tqarg(toHexLabel(d, device().nbCharsWord(type))).tqarg(toHexLabel(v, device().nbCharsWord(type))));
   else log(Log::LineType::SoftError, i18n("Device memory does not match hex file (in %1 at address %2: reading %3 and expecting %4).")
-      .arg(type.label()).arg(toHexLabel(address, device().nbCharsAddress()))
-      .arg(toHexLabel(d, device().nbCharsWord(type))).arg(toHexLabel(v, device().nbCharsWord(type))));
+      .tqarg(type.label()).tqarg(toHexLabel(address, device().nbCharsAddress()))
+      .tqarg(toHexLabel(d, device().nbCharsWord(type))).tqarg(toHexLabel(v, device().nbCharsWord(type))));
   return false;
 }
 
 bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRangeType type, const VerifyData &vdata)
 {
-  if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.contains(i) ) return true; // protected
+  if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.tqcontains(i) ) return true; // protected
   BitValue v = static_cast<const Pic::Memory &>(vdata.memory).normalizedWord(type, i);
   BitValue d = static_cast<const Pic::Memory &>(vdata.memory).normalizeWord(type, i, word);
   if ( type==Pic::MemoryRangeType::Config ) {
-    BitValue pmask = device().config()._words[i].pmask;
-    v = v.clearMaskBits(pmask);
-    d = d.clearMaskBits(pmask);
+    BitValue ptqmask = device().config()._words[i].ptqmask;
+    v = v.clearMaskBits(ptqmask);
+    d = d.clearMaskBits(ptqmask);
   }
   return compareWords(type, i, v, d, vdata.actions);
 }
diff --git a/src/devices/pic/prog/pic_prog_specific.h b/src/devices/pic/prog/pic_prog_specific.h
index fef8a61..249aba6 100644
--- a/src/devices/pic/prog/pic_prog_specific.h
+++ b/src/devices/pic/prog/pic_prog_specific.h
@@ -66,13 +66,13 @@ public:
     double value;
     bool error;
   };
-  class VoltagesData : public QValueVector<VoltageData> {
+  class VoltagesData : public TQValueVector<VoltageData> {
   public:
-    VoltagesData() : QValueVector<VoltageData>(Pic::Nb_VoltageTypes) {}
+    VoltagesData() : TQValueVector<VoltageData>(Pic::Nb_VoltageTypes) {}
   };
 
 public:
-  PicHardware(::Programmer::Base &base, Port::Base *port, const QString &name) : Hardware(base, port, name) {}
+  PicHardware(::Programmer::Base &base, Port::Base *port, const TQString &name) : Hardware(base, port, name) {}
   const Pic::Data &device() const { return static_cast<const Pic::Data &>(*_base.device()); }
   virtual bool readVoltages(VoltagesData &) { return true; }
   virtual bool getTargetMode(Pic::TargetMode &mode) { mode = Pic::TargetInProgramming; return true; }
diff --git a/src/devices/pic/xml/pic_xml_to_data.cpp b/src/devices/pic/xml/pic_xml_to_data.cpp
index f3675de..7f727ff 100644
--- a/src/devices/pic/xml/pic_xml_to_data.cpp
+++ b/src/devices/pic/xml/pic_xml_to_data.cpp
@@ -6,8 +6,8 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqregexp.h>
 
 #include "xml_to_data/device_xml_to_data.h"
 #include "common/common/misc.h"
@@ -19,17 +19,17 @@ namespace Pic
 class XmlToData : public Device::XmlToData<Data>
 {
 private:
-  virtual QString namespaceName() const { return "Pic"; }
+  virtual TQString namespaceName() const { return "Pic"; }
 
-bool getVoltages(ProgVoltageType type, QDomElement element)
+bool getVoltages(ProgVoltageType type, TQDomElement element)
 {
-  QDomElement voltages = findUniqueElement(element, "voltages", "name", type.key());
+  TQDomElement voltages = findUniqueElement(element, "voltages", "name", type.key());
   if ( voltages.isNull() ) return false;
   bool ok1, ok2, ok3;
   data()->_voltages[type].min = voltages.attribute("min").toDouble(&ok1);
   data()->_voltages[type].max = voltages.attribute("max").toDouble(&ok2);
   data()->_voltages[type].nominal = voltages.attribute("nominal").toDouble(&ok3);
-  if ( !ok1 || !ok2 || !ok3 ) qFatal(QString("Cannot extract voltage value for \"%1\"").arg(type.key()));
+  if ( !ok1 || !ok2 || !ok3 ) qFatal(TQString("Cannot extract voltage value for \"%1\"").tqarg(type.key()));
   if ( data()->_voltages[type].min>data()->_voltages[type].max
        || data()->_voltages[type].nominal<data()->_voltages[type].min
        || data()->_voltages[type].nominal>data()->_voltages[type].max )
@@ -37,9 +37,9 @@ bool getVoltages(ProgVoltageType type, QDomElement element)
   return true;
 }
 
-bool getMemoryRange(MemoryRangeType type, QDomElement element)
+bool getMemoryRange(MemoryRangeType type, TQDomElement element)
 {
-  QDomElement range = findUniqueElement(element, "memory", "name", type.key());
+  TQDomElement range = findUniqueElement(element, "memory", "name", type.key());
   if ( range.isNull() ) return false;
   data()->_ranges[type].properties = Present;
   bool ok;
@@ -50,11 +50,11 @@ bool getMemoryRange(MemoryRangeType type, QDomElement element)
   if ( !ok ) qFatal("Cannot extract end address");
   if ( data()->_ranges[type].end<data()->_ranges[type].start ) qFatal("Memory range end is before its start");
   uint nbCharsWord = data()->nbCharsWord(type);
-  if ( data()->nbBitsWord(type)==0 ) qFatal(QString("Architecture doesn't contain memory range %1").arg(type.key()));
+  if ( data()->nbBitsWord(type)==0 ) qFatal(TQString("Architecture doesn't contain memory range %1").tqarg(type.key()));
   if ( type==MemoryRangeType::UserId ) {
-    data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rmask"), nbCharsWord, &ok);
-    if ( !ok ) qFatal("Cannot extract rmask value for user id");
-    if ( !data()->_userIdRecommendedMask.isInside(data()->mask(type)) ) qFatal(QString("rmask is not inside mask %1 (%2)").arg(toHexLabel(data()->_userIdRecommendedMask, 8)).arg(toHexLabel(data()->mask(type), 8)));
+    data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rtqmask"), nbCharsWord, &ok);
+    if ( !ok ) qFatal("Cannot extract rtqmask value for user id");
+    if ( !data()->_userIdRecommendedMask.isInside(data()->tqmask(type)) ) qFatal(TQString("rtqmask is not inside tqmask %1 (%2)").tqarg(toHexLabel(data()->_userIdRecommendedMask, 8)).tqarg(toHexLabel(data()->tqmask(type), 8)));
   }
   if ( range.attribute("hexfile_offset")!="?" ) {
     data()->_ranges[type].properties |= Programmable;
@@ -64,15 +64,15 @@ bool getMemoryRange(MemoryRangeType type, QDomElement element)
     }
   }
   if ( type==MemoryRangeType::Cal && !data()->is18Family() ) {
-    data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_opmask"), nbCharsWord, &ok);
-    if ( !ok ) qFatal("Cannot extract calibration opcode mask");
+    data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_optqmask"), nbCharsWord, &ok);
+    if ( !ok ) qFatal("Cannot extract calibration opcode tqmask");
     data()->_calibration.opcode = fromHexLabel(range.attribute("cal_opcode"), nbCharsWord, &ok);
     if ( !ok ) qFatal("Cannot extract calibration opcode");
-    if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode mask");
-    if ( !data()->_calibration.opcodeMask.isInside(data()->mask(type)) ) qFatal("Calibration mask should be inside opcode mask");
+    if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode tqmask");
+    if ( !data()->_calibration.opcodeMask.isInside(data()->tqmask(type)) ) qFatal("Calibration tqmask should be inside opcode tqmask");
   }
-  QString wwa = range.attribute("word_write_align");
-  QString wea = range.attribute("word_erase_align");
+  TQString wwa = range.attribute("word_write_align");
+  TQString wea = range.attribute("word_erase_align");
   if ( type==MemoryRangeType::Code ) {
     if ( data()->_architecture==Architecture::P18F || data()->_architecture==Architecture::P18J ) {
       data()->_nbWordsCodeWrite = wwa.toUInt(&ok);
@@ -88,31 +88,31 @@ bool getMemoryRange(MemoryRangeType type, QDomElement element)
   return true;
 }
 
-bool hasValue(const Pic::Config::Mask &mask, BitValue value)
+bool hasValue(const Pic::Config::Mask &tqmask, BitValue value)
 {
-  for (uint i=0; i<uint(mask.values.count()); i++)
-    if ( mask.values[i].value==value ) return true;
+  for (uint i=0; i<uint(tqmask.values.count()); i++)
+    if ( tqmask.values[i].value==value ) return true;
   return false;
 }
 
-void processName(const Pic::Config::Mask &cmask, BitValue pmask, Pic::Config::Value &cvalue)
+void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config::Value &cvalue)
 {
-  QStringList &cnames = cvalue.configNames[Pic::ConfigNameType::Default];
+  TQStringList &cnames = cvalue.configNames[Pic::ConfigNameType::Default];
   if ( cvalue.name=="invalid" ) {
-    cvalue.name = QString::null;
-    if ( !cnames.isEmpty() ) qFatal(QString("No cname should be defined for invalid value in mask %1").arg(cmask.name));
+    cvalue.name = TQString();
+    if ( !cnames.isEmpty() ) qFatal(TQString("No cname should be defined for invalid value in tqmask %1").tqarg(ctqmask.name));
     return;
   }
-  if ( cvalue.name.isEmpty() ) qFatal(QString("Empty value name in mask %1").arg(cmask.name));
-  if ( cmask.value.isInside(pmask) ) { // protected bits
-    if ( !cnames.isEmpty() ) qFatal(QString("Config name should be null for protected config mask \"%1\"").arg(cmask.name));
+  if ( cvalue.name.isEmpty() ) qFatal(TQString("Empty value name in tqmask %1").tqarg(ctqmask.name));
+  if ( ctqmask.value.isInside(ptqmask) ) { // protected bits
+    if ( !cnames.isEmpty() ) qFatal(TQString("Config name should be null for protected config tqmask \"%1\"").tqarg(ctqmask.name));
   } else {
-    if ( cnames.isEmpty() && cmask.name!="BSSEC" && cmask.name!="BSSIZ" && cmask.name!="SSSEC" && cmask.name!="SSSIZ" ) {
+    if ( cnames.isEmpty() && ctqmask.name!="BSSEC" && ctqmask.name!="BSSIZ" && ctqmask.name!="SSSEC" && ctqmask.name!="SSSIZ" ) {
       // ### FIXME: 18J 24H 30F1010/202X
       if ( data()->architecture()!=Pic::Architecture::P18J && data()->architecture()!=Pic::Architecture::P24H
            && data()->architecture()!=Pic::Architecture::P24F && data()->architecture()!=Pic::Architecture::P33F
            && data()->name()!="30F1010" && data()->name()!="30F2020" && data()->name()!="30F2023" )
-        qFatal(QString("cname not defined for \"%1\" (%2)").arg(cvalue.name).arg(cmask.name));
+        qFatal(TQString("cname not defined for \"%1\" (%2)").tqarg(cvalue.name).tqarg(ctqmask.name));
     }
     if ( cnames.count()==1 && cnames[0]=="_" ) cnames.clear();
     for (uint i=0; i<uint(cnames.count()); i++) {
@@ -121,133 +121,133 @@ void processName(const Pic::Config::Mask &cmask, BitValue pmask, Pic::Config::Va
         bool ok;
         BitValue v = fromHexLabel(cnames[i], &ok);
         uint nbChars = data()->nbCharsWord(MemoryRangeType::Config);
-        BitValue mask = cmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars));
-        if ( ok && v==(mask | cvalue.value) ) continue;
+        BitValue tqmask = ctqmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars));
+        if ( ok && v==(tqmask | cvalue.value) ) continue;
       } else if ( XOR(cnames[i].startsWith("_"), data()->architecture()==Pic::Architecture::P30F) ) continue;
-      qFatal(QString("Invalid config name for \"%1\"/\"%2\"").arg(cmask.name).arg(cvalue.name));
+      qFatal(TQString("Invalid config name for \"%1\"/\"%2\"").tqarg(ctqmask.name).tqarg(cvalue.name));
     }
-    QStringList &ecnames = cvalue.configNames[Pic::ConfigNameType::Extra];
+    TQStringList &ecnames = cvalue.configNames[Pic::ConfigNameType::Extra];
     for (uint i=0; i<uint(ecnames.count()); i++)
-      if ( ecnames[i][0]!='_'  ) qFatal(QString("Invalid extra config name for %1").arg(cvalue.name));
+      if ( ecnames[i][0]!='_'  ) qFatal(TQString("Invalid extra config name for %1").tqarg(cvalue.name));
   }
 }
 
-Pic::Config::Mask toConfigMask(QDomElement mask, BitValue pmask)
+Pic::Config::Mask toConfigMask(TQDomElement tqmask, BitValue ptqmask)
 {
   uint nbChars = data()->nbCharsWord(MemoryRangeType::Config);
   bool ok;
-  QString defName;
-  QMap<Pic::ConfigNameType, QStringList> defConfigNames;
-  Config::Mask cmask;
-  cmask.name = mask.attribute("name");
-  if ( !Config::hasMaskName(cmask.name) ) qFatal(QString("Unknown mask name %1").arg(cmask.name));
-  cmask.value = fromHexLabel(mask.attribute("value"), nbChars, &ok);
-  if ( !ok || cmask.value==0 || cmask.value>data()->mask(MemoryRangeType::Config) )
-    qFatal(QString("Malformed mask value in mask %1").arg(mask.attribute("name")));
-  //QStringList names;
-  QDomNode child = mask.firstChild();
+  TQString defName;
+  TQMap<Pic::ConfigNameType, TQStringList> defConfigNames;
+  Config::Mask ctqmask;
+  ctqmask.name = tqmask.attribute("name");
+  if ( !Config::hasMaskName(ctqmask.name) ) qFatal(TQString("Unknown tqmask name %1").tqarg(ctqmask.name));
+  ctqmask.value = fromHexLabel(tqmask.attribute("value"), nbChars, &ok);
+  if ( !ok || ctqmask.value==0 || ctqmask.value>data()->tqmask(MemoryRangeType::Config) )
+    qFatal(TQString("Malformed tqmask value in tqmask %1").tqarg(tqmask.attribute("name")));
+  //TQStringList names;
+  TQDomNode child = tqmask.firstChild();
   while ( !child.isNull() ) {
-    QDomElement value = child.toElement();
+    TQDomElement value = child.toElement();
     child = child.nextSibling();
     if ( value.isNull() ) continue;
-    if ( value.nodeName()!="value" ) qFatal(QString("Non value child in mask %1").arg(cmask.name));
+    if ( value.nodeName()!="value" ) qFatal(TQString("Non value child in tqmask %1").tqarg(ctqmask.name));
     if ( value.attribute("value")=="default" ) {
-      if ( !defName.isEmpty() ) qFatal(QString("Default value already defined for mask %1").arg(cmask.name));
+      if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for tqmask %1").tqarg(ctqmask.name));
       defName = value.attribute("name");
-      //if ( names.contains(defName) ) qFatal(QString("Value name duplicated in mask %1").arg(cmask.name));
+      //if ( names.tqcontains(defName) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
       //names.append(defName);
-      FOR_EACH(Pic::ConfigNameType, type) defConfigNames[type] = QStringList::split(' ', value.attribute(type.data().key));
+      FOR_EACH(Pic::ConfigNameType, type) defConfigNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
       continue;
     }
     Config::Value cvalue;
     cvalue.value = fromHexLabel(value.attribute("value"), nbChars, &ok);
-    if ( !ok || !cvalue.value.isInside(cmask.value) ) qFatal(QString("Malformed value in mask %1").arg(cmask.name));
+    if ( !ok || !cvalue.value.isInside(ctqmask.value) ) qFatal(TQString("Malformed value in tqmask %1").tqarg(ctqmask.name));
     cvalue.name = value.attribute("name");
-    //if ( names.contains(cvalue.name) ) qFatal(QString("Value name duplicated in mask %1").arg(cmask.name));
+    //if ( names.tqcontains(cvalue.name) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
     //names.append(cvalue.name);
-    FOR_EACH(Pic::ConfigNameType, type) cvalue.configNames[type] = QStringList::split(' ', value.attribute(type.data().key));
-    processName(cmask, pmask, cvalue);
-    cmask.values.append(cvalue);
+    FOR_EACH(Pic::ConfigNameType, type) cvalue.configNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
+    processName(ctqmask, ptqmask, cvalue);
+    ctqmask.values.append(cvalue);
   }
   // add default values
   if ( !defName.isEmpty() ) {
     uint nb = 0;
     BitValue::const_iterator it;
-    for (it=cmask.value.begin(); it!=cmask.value.end(); ++it) {
-      if ( hasValue(cmask, *it) ) continue; // already set
+    for (it=ctqmask.value.begin(); it!=ctqmask.value.end(); ++it) {
+      if ( hasValue(ctqmask, *it) ) continue; // already set
       nb++;
       Config::Value cvalue;
       cvalue.value = *it;
       cvalue.name = defName;
       cvalue.configNames = defConfigNames;
-      processName(cmask, pmask, cvalue);
-      cmask.values.append(cvalue);
+      processName(ctqmask, ptqmask, cvalue);
+      ctqmask.values.append(cvalue);
     }
-    if ( nb<=1 ) qFatal(QString("Default value used less than twice in mask %1").arg(cmask.name));
+    if ( nb<=1 ) qFatal(TQString("Default value used less than twice in tqmask %1").tqarg(ctqmask.name));
   }
-  qHeapSort(cmask.values);
-  return cmask;
+  qHeapSort(ctqmask.values);
+  return ctqmask;
 }
 
-Pic::Config::Word toConfigWord(QDomElement config)
+Pic::Config::Word toConfigWord(TQDomElement config)
 {
   uint nbChars = data()->nbCharsWord(MemoryRangeType::Config);
   Config::Word cword;
   cword.name = config.attribute("name");
   if ( cword.name.isNull() ) qFatal("Config word name not specified.");
   bool ok;
-  cword.wmask = fromHexLabel(config.attribute("wmask"), nbChars, &ok);
-  BitValue gmask = data()->mask(MemoryRangeType::Config);
-  if ( !ok || cword.wmask>gmask ) qFatal(QString("Missing or malformed config wmask \"%1\"").arg(config.attribute("wmask")));
+  cword.wtqmask = fromHexLabel(config.attribute("wtqmask"), nbChars, &ok);
+  BitValue gtqmask = data()->tqmask(MemoryRangeType::Config);
+  if ( !ok || cword.wtqmask>gtqmask ) qFatal(TQString("Missing or malformed config wtqmask \"%1\"").tqarg(config.attribute("wtqmask")));
   cword.bvalue = fromHexLabel(config.attribute("bvalue"), nbChars, &ok);
-  if ( !ok ) qFatal(QString("Missing or malformed config bvalue \"%1\"").arg(config.attribute("bvalue")));
-  if ( config.attribute("pmask").isEmpty() ) cword.pmask = 0;
+  if ( !ok ) qFatal(TQString("Missing or malformed config bvalue \"%1\"").tqarg(config.attribute("bvalue")));
+  if ( config.attribute("ptqmask").isEmpty() ) cword.ptqmask = 0;
   else {
     bool ok;
-    cword.pmask = fromHexLabel(config.attribute("pmask"), nbChars, &ok);
-    if ( !ok || cword.pmask>gmask ) qFatal("Missing or malformed config pmask");
+    cword.ptqmask = fromHexLabel(config.attribute("ptqmask"), nbChars, &ok);
+    if ( !ok || cword.ptqmask>gtqmask ) qFatal("Missing or malformed config ptqmask");
   }
-  cword.ignoredCNames = QStringList::split(' ', config.attribute("icnames"));
+  cword.ignoredCNames = TQStringList::split(' ', config.attribute("icnames"));
   for (uint i=0; i<uint(cword.ignoredCNames.count()); i++)
-    if ( cword.ignoredCNames[i][0]!='_'  ) qFatal(QString("Invalid ignored config name for %1").arg(cword.name));
-  QDomNode child = config.firstChild();
+    if ( cword.ignoredCNames[i][0]!='_'  ) qFatal(TQString("Invalid ignored config name for %1").tqarg(cword.name));
+  TQDomNode child = config.firstChild();
   while ( !child.isNull() ) {
-    QDomElement mask = child.toElement();
+    TQDomElement tqmask = child.toElement();
     child = child.nextSibling();
-    if ( mask.isNull() ) continue;
-    if ( mask.nodeName()!="mask" ) qFatal(QString("Non mask child in config %1").arg(cword.name));
-    if ( mask.attribute("name").isEmpty() ) qFatal(QString("Empty mask name in config %1").arg(cword.name));
-    Config::Mask cmask = toConfigMask(mask, cword.pmask);
-    if ( !cmask.value.isInside(gmask) ) qFatal(QString("Mask value not inside mask in config %1").arg(cword.name));
-    for (uint i=0; i<uint(cword.masks.count()); i++) {
-      if ( cword.masks[i].name==cmask.name ) qFatal(QString("Duplicated mask name %1 in config %2").arg(cmask.name).arg(cword.name));
-      if ( cmask.value.isOverlapping(cword.masks[i].value) ) qFatal(QString("Overlapping masks in config %1").arg(cword.name));
+    if ( tqmask.isNull() ) continue;
+    if ( tqmask.nodeName()!="tqmask" ) qFatal(TQString("Non tqmask child in config %1").tqarg(cword.name));
+    if ( tqmask.attribute("name").isEmpty() ) qFatal(TQString("Empty tqmask name in config %1").tqarg(cword.name));
+    Config::Mask ctqmask = toConfigMask(tqmask, cword.ptqmask);
+    if ( !ctqmask.value.isInside(gtqmask) ) qFatal(TQString("Mask value not inside tqmask in config %1").tqarg(cword.name));
+    for (uint i=0; i<uint(cword.tqmasks.count()); i++) {
+      if ( cword.tqmasks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name));
+      if ( ctqmask.value.isOverlapping(cword.tqmasks[i].value) ) qFatal(TQString("Overlapping tqmasks in config %1").tqarg(cword.name));
     }
-    cword.masks.append(cmask);
+    cword.tqmasks.append(ctqmask);
   }
-  qHeapSort(cword.masks);
-  BitValue mask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.pmask);
-  if ( config.attribute("cmask").isEmpty() ) {
-    if ( data()->_architecture==Pic::Architecture::P30F ) cword.cmask = cword.wmask;
-    else cword.cmask = mask;
+  qHeapSort(cword.tqmasks);
+  BitValue tqmask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.ptqmask);
+  if ( config.attribute("ctqmask").isEmpty() ) {
+    if ( data()->_architecture==Pic::Architecture::P30F ) cword.ctqmask = cword.wtqmask;
+    else cword.ctqmask = tqmask;
   } else {
     bool ok;
-    cword.cmask = fromHexLabel(config.attribute("cmask"), nbChars, &ok);
-    if ( !ok || cword.cmask>gmask ) qFatal("Missing or malformed config cmask");
-    //if ( data()->_architecture==Pic::Architecture::P30X &&cword.cmask==cword.wmask ) qFatal(QString("Redundant cmask in %1").arg(cword.name));
-    if ( cword.cmask==mask ) qFatal(QString("Redundant cmask in %1").arg(cword.name));
+    cword.ctqmask = fromHexLabel(config.attribute("ctqmask"), nbChars, &ok);
+    if ( !ok || cword.ctqmask>gtqmask ) qFatal("Missing or malformed config ctqmask");
+    //if ( data()->_architecture==Pic::Architecture::P30X &&cword.ctqmask==cword.wtqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name));
+    if ( cword.ctqmask==tqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name));
   }
-  if ( !cword.pmask.isInside(cword.usedMask()) ) qFatal("pmask should be inside or'ed mask values.");
+  if ( !cword.ptqmask.isInside(cword.usedMask()) ) qFatal("ptqmask should be inside or'ed tqmask values.");
   return cword;
 }
 
-QValueVector<Pic::Config::Word> getConfigWords(QDomElement element)
+TQValueVector<Pic::Config::Word> getConfigWords(TQDomElement element)
 {
   uint nbWords = data()->nbWords(MemoryRangeType::Config);
-  QValueVector<Config::Word> configWords(nbWords);
-  QDomNode child = element.firstChild();
+  TQValueVector<Config::Word> configWords(nbWords);
+  TQDomNode child = element.firstChild();
   while ( !child.isNull() ) {
-    QDomElement config = child.toElement();
+    TQDomElement config = child.toElement();
     child = child.nextSibling();
     if ( config.isNull() || config.nodeName()!="config" ) continue;
     bool ok;
@@ -255,25 +255,25 @@ QValueVector<Pic::Config::Word> getConfigWords(QDomElement element)
     if ( !ok ) qFatal("Missing or malformed config offset");
     if ( (offset % data()->addressIncrement(MemoryRangeType::Config))!=0 ) qFatal("Config offset not aligned");
     offset /= data()->addressIncrement(MemoryRangeType::Config);
-    if ( offset>=nbWords ) qFatal(QString("Offset too big %1/%2").arg(offset).arg(nbWords));
-    if ( !configWords[offset].name.isNull() ) qFatal(QString("Config offset %1 is duplicated").arg(offset));
+    if ( offset>=nbWords ) qFatal(TQString("Offset too big %1/%2").tqarg(offset).tqarg(nbWords));
+    if ( !configWords[offset].name.isNull() ) qFatal(TQString("Config offset %1 is duplicated").tqarg(offset));
     for (uint i=0; i<nbWords; i++) {
       if ( !configWords[i].name.isNull() && configWords[i].name==config.attribute("name") )
-        qFatal(QString("Duplicated config name %1").arg(configWords[i].name));
+        qFatal(TQString("Duplicated config name %1").tqarg(configWords[i].name));
     }
     configWords[offset] = toConfigWord(config);
   }
   return configWords;
 }
 
-QString getChecksumData(QDomElement checksum)
+TQString getChecksumData(TQDomElement checksum)
 {
   Checksum::Data cdata;
   cdata.blankChecksum = 0x0;
   cdata.checkChecksum = 0x0;
 
   const Protection &protection = data()->_config->protection();
-  QString valueName;
+  TQString valueName;
   if ( protection.family()==Protection::BlockProtection ) {
     valueName = checksum.attribute("protected_blocks");
     bool ok;
@@ -281,10 +281,10 @@ QString getChecksumData(QDomElement checksum)
     uint max = (protection.hasBootBlock() ? 1 : 0) + protection.nbBlocks();
     if ( !ok || nb>max ) qFatal("Invalid number of protected blocks for checksum");
     if ( nb>0 ) cdata.protectedMaskNames += "CPB";
-    for (uint i=1; i<nb; i++) cdata.protectedMaskNames += "CP_" + QString::number(i-1);
+    for (uint i=1; i<nb; i++) cdata.protectedMaskNames += "CP_" + TQString::number(i-1);
     cdata.bbsize = checksum.attribute("bbsize");
-    const Config::Mask *mask = data()->_config->findMask(protection.bootSizeMaskName());
-    if ( mask==0 ) {
+    const Config::Mask *tqmask = data()->_config->findMask(protection.bootSizeMaskName());
+    if ( tqmask==0 ) {
       if ( !cdata.bbsize.isEmpty() ) qFatal("Device does not have a variable boot size (no \"bbsize\" allowed in checksum)");
     } else if ( cdata.bbsize.isEmpty() ) {
       if ( nb==1 ) qFatal("\"bbsize\" should be define in checksum for \"protected_blocks\"==1");
@@ -298,9 +298,9 @@ QString getChecksumData(QDomElement checksum)
     if ( protection.family()==Protection::NoProtection && !valueName.isEmpty() )
       qFatal("Checksum protected attribute for device with no code protection");
   }
-  if ( data()->_checksums.contains(valueName) ) qFatal("Duplicate checksum protected range");
+  if ( data()->_checksums.tqcontains(valueName) ) qFatal("Duplicate checksum protected range");
 
-  QString s = checksum.attribute("constant");
+  TQString s = checksum.attribute("constant");
   if ( s.isEmpty() ) cdata.constant = 0x0000;
   else {
     bool ok;
@@ -317,16 +317,16 @@ QString getChecksumData(QDomElement checksum)
 
   s = checksum.attribute("mprotected");
   if ( !s.isEmpty() ) {
-    QStringList list = QStringList::split(" ", s);
+    TQStringList list = TQStringList::split(" ", s);
     for (uint i=0; i<uint(list.count()); i++) {
-      const Config::Mask *mask = data()->config().findMask(list[i]);
-      if ( mask==0 ) qFatal(QString("Not valid mask name for \"protected\" tag in checksum: %1").arg(list[i]));
-      if ( mask->values.count()==2 ) continue;
-      for (uint k=0; k<uint(mask->values.count()); k++) {
-        QString valueName = mask->values[k].name;
+      const Config::Mask *tqmask = data()->config().findMask(list[i]);
+      if ( tqmask==0 ) qFatal(TQString("Not valid tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
+      if ( tqmask->values.count()==2 ) continue;
+      for (uint k=0; k<uint(tqmask->values.count()); k++) {
+        TQString valueName = tqmask->values[k].name;
         if ( valueName.isEmpty() ) continue;
         if ( !protection.isNoneProtectedValueName(valueName) && !protection.isAllProtectedValueName(valueName) )
-          qFatal(QString("Not switch protection from mask name for \"protected\" tag in checksum: %1").arg(list[i]));
+          qFatal(TQString("Not switch protection from tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
       }
     }
     cdata.protectedMaskNames = list;
@@ -352,25 +352,25 @@ QString getChecksumData(QDomElement checksum)
   return valueName;
 }
 
-virtual void processDevice(QDomElement device)
+virtual void processDevice(TQDomElement device)
 {
   Device::XmlToDataBase::processDevice(device);
 
-  QString arch = device.attribute("architecture");
+  TQString arch = device.attribute("architecture");
   data()->_architecture = Architecture::fromKey(arch);
-  if ( data()->_architecture==Architecture::Nb_Types ) qFatal(QString("Unrecognized architecture \"%1\"").arg(arch));
-  if ( (data()->_architecture==Architecture::P18F && data()->_name.contains("C"))
-       || (data()->_architecture==Architecture::P18F && data()->_name.contains("J")) ) qFatal("Not matching family");
+  if ( data()->_architecture==Architecture::Nb_Types ) qFatal(TQString("Unrecognized architecture \"%1\"").tqarg(arch));
+  if ( (data()->_architecture==Architecture::P18F && data()->_name.tqcontains("C"))
+       || (data()->_architecture==Architecture::P18F && data()->_name.tqcontains("J")) ) qFatal("Not matching family");
 
   bool ok;
-  QString pc = device.attribute("pc");
+  TQString pc = device.attribute("pc");
   data()->_nbBitsPC = data()->_architecture.data().nbBitsPC;
   if ( data()->_nbBitsPC==0 ) {
     data()->_nbBitsPC = pc.toUInt(&ok);
     if ( !ok || data()->_nbBitsPC==0 ) qFatal("Malformed or missing PC");
   } else if ( !pc.isEmpty() ) qFatal("No PC should be provided for this device architecture");
 
-  QString sw = device.attribute("self_write");
+  TQString sw = device.attribute("self_write");
   data()->_selfWrite = (data()->_memoryTechnology!=Device::MemoryTechnology::Flash ? SelfWrite::No : data()->_architecture.data().selfWrite);
   if ( data()->_selfWrite==SelfWrite::Nb_Types ) {
     data()->_selfWrite = SelfWrite::fromKey(sw);
@@ -379,8 +379,8 @@ virtual void processDevice(QDomElement device)
 
   // device ids
   FOR_EACH(Device::Special, special) {
-    QString key = "id" + (special==Device::Special::Normal ? QString::null : QString("_") + special.key());
-    QString id = device.attribute(key);
+    TQString key = "id" + (special==Device::Special::Normal ? TQString() : TQString("_") + special.key());
+    TQString id = device.attribute(key);
     if ( id.isEmpty() ) {
       if ( special==Device::Special::Normal ) data()->_ids[special] = 0x0000;
     } else {
@@ -390,13 +390,13 @@ virtual void processDevice(QDomElement device)
   }
 
   // voltages
-  QStringList names;
+  TQStringList names;
   FOR_EACH(ProgVoltageType, vtype) {
     names += vtype.key();
     if ( !getVoltages(vtype, device) ) {
       switch (vtype.type()) {
         case ProgVoltageType::Vpp:
-        case ProgVoltageType::VddBulkErase: qFatal(QString("Voltage \"%1\" not defined").arg(vtype.key()));
+        case ProgVoltageType::VddBulkErase: qFatal(TQString("Voltage \"%1\" not defined").tqarg(vtype.key()));
         case ProgVoltageType::VddWrite: data()->_voltages[ProgVoltageType::VddWrite] = data()->_voltages[ProgVoltageType::VddBulkErase]; break;
         case ProgVoltageType::Nb_Types: Q_ASSERT(false); break;
       }
@@ -426,7 +426,7 @@ virtual void processDevice(QDomElement device)
       Address start2 = data()->_ranges[i].start + data()->_ranges[i].hexFileOffset;
       Address end2 = data()->_ranges[i].end + data()->_ranges[i].hexFileOffset;
       if ( end1>=start2 && start1<=end2 )
-        qFatal(QString("Overlapping memory ranges (%1 and %2)").arg(k.key()).arg(i.key()));
+        qFatal(TQString("Overlapping memory ranges (%1 and %2)").tqarg(k.key()).tqarg(i.key()));
     }
   }
   checkTagNames(device, "memory", names);
@@ -434,24 +434,24 @@ virtual void processDevice(QDomElement device)
     qFatal("Id present and device id memory range absent or the opposite");
 
   // config words
-  QValueVector<Config::Word> cwords = getConfigWords(device);
+  TQValueVector<Config::Word> cwords = getConfigWords(device);
   uint nbWords = data()->nbWords(MemoryRangeType::Config);
   data()->_config->_words.resize(nbWords);
   FOR_EACH(Pic::ConfigNameType, type) {
-    QMap<QString, QString> cnames; // cname -> mask name
+    TQMap<TQString, TQString> cnames; // cname -> tqmask name
     for (uint i=0; i<nbWords; i++) {
-      if ( cwords[i].name.isNull() ) qFatal(QString("Config word #%1 not defined").arg(i));
+      if ( cwords[i].name.isNull() ) qFatal(TQString("Config word #%1 not defined").tqarg(i));
       data()->_config->_words[i] = cwords[i];
       const Config::Word &word = data()->_config->_words[i];
-      for (uint j=0; j<uint(word.masks.count()); j++) {
-        const Config::Mask &mask = word.masks[j];
-        for (uint k=0; k<uint(mask.values.count()); k++) {
-          const QStringList &vcnames = mask.values[k].configNames[type];
+      for (uint j=0; j<uint(word.tqmasks.count()); j++) {
+        const Config::Mask &tqmask = word.tqmasks[j];
+        for (uint k=0; k<uint(tqmask.values.count()); k++) {
+          const TQStringList &vcnames = tqmask.values[k].configNames[type];
           for (uint l=0; l<uint(vcnames.count()); l++) {
             if ( vcnames[l].startsWith("0x") ) continue;
-            if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=mask.name )
-              qFatal(QString("Duplicated config name for %1/%2").arg(mask.name).arg(mask.values[k].name));
-            cnames[vcnames[l]] = word.masks[j].name;
+            if ( cnames.tqcontains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
+              qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name));
+            cnames[vcnames[l]] = word.tqmasks[j].name;
           }
         }
       }
@@ -460,64 +460,64 @@ virtual void processDevice(QDomElement device)
   // check validity of value names
   for (uint i=0; i<nbWords; i++) {
     const Config::Word &word = data()->_config->_words[i];
-    for (uint j=0; j<uint(word.masks.count()); j++) {
-      const Config::Mask &mask = word.masks[j];
-      for (uint k=0; k<uint(mask.values.count()); k++) {
-        const Config::Value &value = mask.values[k];
+    for (uint j=0; j<uint(word.tqmasks.count()); j++) {
+      const Config::Mask &tqmask = word.tqmasks[j];
+      for (uint k=0; k<uint(tqmask.values.count()); k++) {
+        const Config::Value &value = tqmask.values[k];
         if ( !value.isValid() ) continue;
-        if ( !data()->_config->checkValueName(mask.name, value.name) )
-          qFatal(QString("Malformed value name \"%1\" in mask %2").arg(value.name).arg(mask.name));
+        if ( !data()->_config->checkValueName(tqmask.name, value.name) )
+          qFatal(TQString("Malformed value name \"%1\" in tqmask %2").tqarg(value.name).tqarg(tqmask.name));
       }
     }
   }
   // check if all values are explicit
   for (uint i=0; i<nbWords; i++) {
     const Config::Word &word = data()->_config->_words[i];
-    for (uint j=0; j<uint(word.masks.count()); j++) {
-      const Config::Mask &mask = word.masks[j];
+    for (uint j=0; j<uint(word.tqmasks.count()); j++) {
+      const Config::Mask &tqmask = word.tqmasks[j];
       BitValue::const_iterator it;
-      for (it=mask.value.begin(); it!=mask.value.end(); ++it)
-        if ( !hasValue(mask, *it) ) qFatal(QString("Value %1 not defined in mask %2").arg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).arg(mask.name));
+      for (it=tqmask.value.begin(); it!=tqmask.value.end(); ++it)
+        if ( !hasValue(tqmask, *it) ) qFatal(TQString("Value %1 not defined in tqmask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(tqmask.name));
     }
   }
 
   // checksums (after config bits!)
-  QDomElement checksums = findUniqueElement(device, "checksums", QString::null, QString::null);
+  TQDomElement checksums = findUniqueElement(device, "checksums", TQString(), TQString());
   if ( checksums.isNull() ) {
     // qFatal("No checksum defined"); // #### FIXME
   } else {
-    QMap<QString, bool> valueNames;
+    TQMap<TQString, bool> valueNames;
     const Pic::Protection &protection = data()->_config->protection();
     if ( protection.family()==Protection::BasicProtection ) {
-      QString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
-      const Pic::Config::Mask *mask = data()->_config->findMask(maskName);
-      Q_ASSERT(mask);
-      for (uint i=0; i<uint(mask->values.count()); i++) valueNames[mask->values[i].name] = false;
+      TQString tqmaskName = protection.tqmaskName(Protection::ProgramProtected, MemoryRangeType::Code);
+      const Pic::Config::Mask *tqmask = data()->_config->findMask(tqmaskName);
+      Q_ASSERT(tqmask);
+      for (uint i=0; i<uint(tqmask->values.count()); i++) valueNames[tqmask->values[i].name] = false;
     }
-    QDomNode child = checksums.firstChild();
+    TQDomNode child = checksums.firstChild();
     while ( !child.isNull() ) {
       if ( !child.isElement() ) continue;
       if ( child.nodeName()!="checksum" ) qFatal("Childs of \"checksums\" should \"checksum\"");
-      QString valueName = getChecksumData(child.toElement());
+      TQString valueName = getChecksumData(child.toElement());
       if ( protection.family()==Protection::BasicProtection ) {
-        if ( !valueNames.contains(valueName) ) qFatal("Unknown protected attribute");
+        if ( !valueNames.tqcontains(valueName) ) qFatal("Unknown protected attribute");
         valueNames[valueName] = true;
       }
       child = child.nextSibling();
     }
-    QMap<QString, bool>::const_iterator it;
+    TQMap<TQString, bool>::const_iterator it;
     for (it=valueNames.begin(); it!=valueNames.end(); ++it)
-      if ( !it.key().isEmpty() && !it.data() ) qFatal(QString("Missing checksum \"%1\"").arg(it.key()));
+      if ( !it.key().isEmpty() && !it.data() ) qFatal(TQString("Missing checksum \"%1\"").tqarg(it.key()));
   }
 }
 
-void processMirrored(QDomElement element)
+void processMirrored(TQDomElement element)
 {
-  QValueVector<RangeData> mirrored;
-  QDomNode child = element.firstChild();
+  TQValueVector<RangeData> mirrored;
+  TQDomNode child = element.firstChild();
   while ( !child.isNull() ) {
     if ( !child.isElement() ) qFatal("\"mirror\" child should be an element");
-    QDomElement e = child.toElement();
+    TQDomElement e = child.toElement();
     if ( e.nodeName()!="range" ) qFatal("\"mirror\" child should be \"range\"");
     RangeData rd;
     bool ok;
@@ -532,7 +532,7 @@ void processMirrored(QDomElement element)
   if ( !mirrored.isEmpty() ) static_cast<RegistersData *>(data()->_registersData)->mirrored.append(mirrored);
 }
 
-void processUnused(QDomElement e)
+void processUnused(TQDomElement e)
 {
   RangeData rd;
   bool ok;
@@ -544,64 +544,64 @@ void processUnused(QDomElement e)
   static_cast<RegistersData *>(data()->_registersData)->unused.append(rd);
 }
 
-void processSfr(QDomElement e)
+void processSfr(TQDomElement e)
 {
-  QString name = e.attribute("name");
+  TQString name = e.attribute("name");
   if ( name.isEmpty() ) qFatal("SFR cannot have empty name");
-  if ( data()->registersData().sfrs.contains(name) || data()->registersData().combined.contains(name) )
+  if ( data()->registersData().sfrs.tqcontains(name) || data()->registersData().combined.tqcontains(name) )
     qFatal("SFR name is duplicated");
   bool ok;
   uint address = fromHexLabel(e.attribute("address"), &ok);
-  if ( !ok ) qFatal(QString("SFR %1 address %2 is malformed").arg(name).arg(e.attribute("address")));
+  if ( !ok ) qFatal(TQString("SFR %1 address %2 is malformed").tqarg(name).tqarg(e.attribute("address")));
   uint rlength = data()->registersData().nbBanks * data()->architecture().data().registerBankLength;
-  if ( address>=rlength ) qFatal(QString("Address %1 outside register range").arg(toHexLabel(address, 3)));
+  if ( address>=rlength ) qFatal(TQString("Address %1 outside register range").tqarg(toHexLabel(address, 3)));
   RegisterData rdata;
   rdata.address = address;
   uint nb = data()->registersData().nbBits();
-  if ( nb>Device::MAX_NB_PORT_BITS ) qFatal(QString("Need higher MAX_NB_PORT_BITS: %1").arg(nb));
-  QString access = e.attribute("access");
+  if ( nb>Device::MAX_NB_PORT_BITS ) qFatal(TQString("Need higher MAX_NB_PORT_BITS: %1").tqarg(nb));
+  TQString access = e.attribute("access");
   if ( uint(access.length())!=nb ) qFatal("access is missing or malformed");
-  QString mclr = e.attribute("mclr");
+  TQString mclr = e.attribute("mclr");
   if ( uint(mclr.length())!=nb ) qFatal("mclr is missing or malformed");
-  QString por = e.attribute("por");
+  TQString por = e.attribute("por");
   if ( uint(por.length())!=nb ) qFatal("por is missing or malformed");
   for (uint i=0; i<nb; i++) {
     uint k = nb - i - 1;
     bool ok;
     rdata.bits[k].properties = RegisterBitProperties(fromHex(access[i].latin1(), &ok));
-    if ( !ok || rdata.bits[k].properties>MaxRegisterBitProperty ) qFatal(QString("Malformed access bit %1").arg(k));
+    if ( !ok || rdata.bits[k].properties>MaxRegisterBitProperty ) qFatal(TQString("Malformed access bit %1").tqarg(k));
     rdata.bits[k].mclr = RegisterBitState(fromHex(mclr[i].latin1(), &ok));
-    if ( !ok || rdata.bits[k].mclr>Nb_RegisterBitStates ) qFatal(QString("Malformed mclr bit %1").arg(k));
+    if ( !ok || rdata.bits[k].mclr>Nb_RegisterBitStates ) qFatal(TQString("Malformed mclr bit %1").tqarg(k));
     rdata.bits[k].por = RegisterBitState(fromHex(por[i].latin1(), &ok));
-    if ( !ok || rdata.bits[k].por>Nb_RegisterBitStates ) qFatal(QString("Malformed por bit %1").arg(k));
+    if ( !ok || rdata.bits[k].por>Nb_RegisterBitStates ) qFatal(TQString("Malformed por bit %1").tqarg(k));
   }
   static_cast<RegistersData *>(data()->_registersData)->sfrs[name] = rdata;
 }
 
-void processCombined(QDomElement e)
+void processCombined(TQDomElement e)
 {
-  QString name = e.attribute("name");
+  TQString name = e.attribute("name");
   if ( name.isEmpty() ) qFatal("Combined register cannot have empty name");
-  if ( data()->registersData().sfrs.contains(name) || data()->registersData().combined.contains(name) )
+  if ( data()->registersData().sfrs.tqcontains(name) || data()->registersData().combined.tqcontains(name) )
     qFatal("Combined register name is duplicated");
   bool ok;
   CombinedData rdata;
   rdata.address = fromHexLabel(e.attribute("address"), &ok);
-  if ( !ok ) qFatal(QString("Combined %1 address %2 is malformed").arg(name).arg(e.attribute("address")));
+  if ( !ok ) qFatal(TQString("Combined %1 address %2 is malformed").tqarg(name).tqarg(e.attribute("address")));
   uint rlength = data()->registersData().nbBanks * data()->architecture().data().registerBankLength;
-  if ( rdata.address>=rlength ) qFatal(QString("Address %1 outside register range").arg(toHexLabel(rdata.address, 3)));
+  if ( rdata.address>=rlength ) qFatal(TQString("Address %1 outside register range").tqarg(toHexLabel(rdata.address, 3)));
   rdata.nbChars = 2*e.attribute("size").toUInt(&ok);
-  if ( !ok || rdata.nbChars<2 ) qFatal(QString("Combined %1 size %2 is malformed").arg(name).arg(e.attribute("size")));
+  if ( !ok || rdata.nbChars<2 ) qFatal(TQString("Combined %1 size %2 is malformed").tqarg(name).tqarg(e.attribute("size")));
   Address end = rdata.address + rdata.nbChars/2 - 1;
-  if ( end>=rlength ) qFatal(QString("Address %1 outside register range").arg(toHexLabel(end, 3)));
+  if ( end>=rlength ) qFatal(TQString("Address %1 outside register range").tqarg(toHexLabel(end, 3)));
   static_cast<RegistersData *>(data()->_registersData)->combined[name] = rdata;
 }
 
-void processDeviceRegisters(QDomElement element)
+void processDeviceRegisters(TQDomElement element)
 {
-  QString s = element.attribute("same_as");
+  TQString s = element.attribute("same_as");
   if ( !s.isEmpty() ) {
-    if ( !_map.contains(s) ) qFatal(QString("Registers same as unknown device %1").arg(s));
+    if ( !_map.tqcontains(s) ) qFatal(TQString("Registers same as unknown device %1").tqarg(s));
     const Pic::Data *d = static_cast<const Pic::Data *>(_map[s]);
     data()->_registersData = d->_registersData;
     return;
@@ -614,54 +614,54 @@ void processDeviceRegisters(QDomElement element)
   if ( data()->is18Family() ) {
     rdata.accessBankSplit = fromHexLabel(element.attribute("access_bank_split_offset"), &ok);
     if ( !ok || rdata.accessBankSplit==0 || rdata.accessBankSplit>=0xFF ) qFatal("Malformed access bank split offset");
-    rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_mask"), &ok);
-    if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank mask");
+    rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_tqmask"), &ok);
+    if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank tqmask");
   } else {
     rdata.accessBankSplit = 0;
     rdata.unusedBankMask = 0;
   }
 
-  QDomNode child = element.firstChild();
+  TQDomNode child = element.firstChild();
   while ( !child.isNull() ) {
     if ( !child.isElement() ) qFatal("\"device\" child should be an element");
-    QDomElement e = child.toElement();
+    TQDomElement e = child.toElement();
     if ( e.nodeName()=="mirror" ) processMirrored(e);
     else if ( e.nodeName()=="unused" ) processUnused(e);
     else if ( e.nodeName()=="combined" ) processCombined(e);
     else if ( e.nodeName()=="sfr" ) processSfr(e);
-    else qFatal(QString("Node name \"%1\" is not recognized").arg(e.nodeName()));
+    else qFatal(TQString("Node name \"%1\" is not recognized").tqarg(e.nodeName()));
     child = child.nextSibling();
   }
 
   for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
-    QString portname = rdata.portName(i);
+    TQString portname = rdata.portName(i);
     if ( portname.isEmpty() ) break;
-    bool hasPort = rdata.sfrs.contains(portname);
-    QString trisname = rdata.trisName(i);
+    bool hasPort = rdata.sfrs.tqcontains(portname);
+    TQString trisname = rdata.trisName(i);
     if ( trisname.isEmpty() ) continue;
-    bool hasTris = rdata.sfrs.contains(trisname);
-    if ( !hasPort && hasTris ) qFatal(QString("%1 needs %2 to be present").arg(trisname).arg(portname));
-    QString latchname = rdata.latchName(i);
+    bool hasTris = rdata.sfrs.tqcontains(trisname);
+    if ( !hasPort && hasTris ) qFatal(TQString("%1 needs %2 to be present").tqarg(trisname).tqarg(portname));
+    TQString latchname = rdata.latchName(i);
     if ( latchname.isEmpty() ) continue;
-    bool hasLatch = rdata.sfrs.contains(latchname);
-    if ( !hasPort && hasLatch ) qFatal(QString("%1 needs %2 to be present").arg(latchname).arg(portname));
+    bool hasLatch = rdata.sfrs.tqcontains(latchname);
+    if ( !hasPort && hasLatch ) qFatal(TQString("%1 needs %2 to be present").tqarg(latchname).tqarg(portname));
   }
 }
 
-void processRegistersFile(const QString &filename, QStringList &devices)
+void processRegistersFile(const TQString &filename, TQStringList &devices)
 {
-  QDomDocument doc = parseFile(filename);
-  QDomElement root = doc.documentElement();
+  TQDomDocument doc = parseFile(filename);
+  TQDomElement root = doc.documentElement();
   if ( root.nodeName()!="registers" ) qFatal("root node should be \"registers\"");
-  for (QDomNode child=root.firstChild(); !child.isNull(); child = child.nextSibling()) {
+  for (TQDomNode child=root.firstChild(); !child.isNull(); child = child.nextSibling()) {
     if ( child.isComment() ) qDebug("comment: %s", child.toComment().data().latin1());
     else {
       if ( !child.isElement() ) qFatal("\"registers\" child should be an element");
       if ( child.nodeName()!="device" ) qFatal("Device node should be named \"device\"");
-      QDomElement device = child.toElement();
-      QString name = device.attribute("name");
-      if ( devices.contains(name) ) qFatal(QString("Registers already defined for %1").arg(name));
-      if ( _map.contains(name) ) {
+      TQDomElement device = child.toElement();
+      TQString name = device.attribute("name");
+      if ( devices.tqcontains(name) ) qFatal(TQString("Registers already defined for %1").tqarg(name));
+      if ( _map.tqcontains(name) ) {
         _data = _map[name];
         processDeviceRegisters(device);
         devices.append(name);
@@ -672,34 +672,34 @@ void processRegistersFile(const QString &filename, QStringList &devices)
 
 void processRegisters()
 {
-  QStringList devices;
+  TQStringList devices;
   processRegistersFile("registers/registers.xml", devices);
   processRegistersFile("registers/registers_missing.xml", devices);
 
   // check if we miss any register description
-  QMap<QString, Device::Data *>::const_iterator it = _map.begin();
+  TQMap<TQString, Device::Data *>::const_iterator it = _map.begin();
   for (; it!=_map.end(); ++it) {
     _data = it.data();
-    if ( !devices.contains(it.key()) ) qWarning("Register description not found for %s", it.key().latin1());
+    if ( !devices.tqcontains(it.key()) ) qWarning("Register description not found for %s", it.key().latin1());
   }
 }
 
-virtual void checkPins(const QMap<QString, uint> &pinLabels) const
+virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
 {
-  if ( !pinLabels.contains("VDD") ) qFatal("No VDD pin specified");
-  if ( !pinLabels.contains("VSS") ) qFatal("No VSS pin specified");
-  QMap<QString, uint>::const_iterator it;
+  if ( !pinLabels.tqcontains("VDD") ) qFatal("No VDD pin specified");
+  if ( !pinLabels.tqcontains("VSS") ) qFatal("No VSS pin specified");
+  TQMap<TQString, uint>::const_iterator it;
   for (it=pinLabels.begin(); it!=pinLabels.end(); ++it) {
     if ( it.key()=="VDD" || it.key()=="VSS" || it.key().startsWith("CCP") ) continue;
-    if ( it.data()!=1 ) qFatal(QString("Duplicated pin \"%1\"").arg(it.key()));
+    if ( it.data()!=1 ) qFatal(TQString("Duplicated pin \"%1\"").tqarg(it.key()));
   }
   const Pic::RegistersData &rdata = static_cast<const Pic::RegistersData &>(*_data->registersData());
   for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
     if ( !rdata.hasPort(i) ) continue;
     for (uint k=0; k<Device::MAX_NB_PORT_BITS; k++) {
       if ( !rdata.hasPortBit(i, k) ) continue;
-      QString name = rdata.portBitName(i, k);
-      if ( !pinLabels.contains(name) ) qFatal(QString("Pin \"%1\" not present").arg(name));
+      TQString name = rdata.portBitName(i, k);
+      if ( !pinLabels.tqcontains(name) ) qFatal(TQString("Pin \"%1\" not present").tqarg(name));
     }
   }
 }
diff --git a/src/devices/pic/xml_data/10F200.xml b/src/devices/pic/xml_data/10F200.xml
index 11ce1ff..eb3c1f1 100644
--- a/src/devices/pic/xml_data/10F200.xml
+++ b/src/devices/pic/xml_data/10F200.xml
@@ -27,29 +27,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x0FE" />
-  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x100" end="0x103" rmask="0x00F"          />
+  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x100" end="0x103" rtqmask="0x00F"          />
   <memory name="config"             start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x104" end="0x104" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="default" name="invalid" />
       <value value="0x003"   name="INTRC" cname="_IntRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:0FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F202.xml b/src/devices/pic/xml_data/10F202.xml
index 25ce72a..f7c420e 100644
--- a/src/devices/pic/xml_data/10F202.xml
+++ b/src/devices/pic/xml_data/10F202.xml
@@ -27,29 +27,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x1FE" />
-  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x200" end="0x203" rmask="0x00F"          />
+  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x200" end="0x203" rtqmask="0x00F"          />
   <memory name="config"             start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x204" end="0x204" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="default" name="invalid" />
       <value value="0x003" name="INTRC" cname="_IntRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F204.xml b/src/devices/pic/xml_data/10F204.xml
index e2d2e6d..40631ef 100644
--- a/src/devices/pic/xml_data/10F204.xml
+++ b/src/devices/pic/xml_data/10F204.xml
@@ -27,29 +27,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x0FE" />
-  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x100" end="0x103" rmask="0x00F"          />
+  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x100" end="0x103" rtqmask="0x00F"          />
   <memory name="config"             start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x104" end="0x104" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="default" name="invalid" />
       <value value="0x003" name="INTRC" cname="_IntRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:0FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F206.xml b/src/devices/pic/xml_data/10F206.xml
index 4e66268..c5030eb 100644
--- a/src/devices/pic/xml_data/10F206.xml
+++ b/src/devices/pic/xml_data/10F206.xml
@@ -27,29 +27,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x1FE" />
-  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x200" end="0x203" rmask="0x00F"          />
+  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x200" end="0x203" rtqmask="0x00F"          />
   <memory name="config"             start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x204" end="0x204" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="default" name="invalid" />
       <value value="0x003" name="INTRC" cname="_IntRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F220.xml b/src/devices/pic/xml_data/10F220.xml
index 694d161..99e7019 100644
--- a/src/devices/pic/xml_data/10F220.xml
+++ b/src/devices/pic/xml_data/10F220.xml
@@ -28,33 +28,33 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x0FE" />
-  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x100" end="0x103" rmask="0x00F"          />
+  <memory name="calibration"        start="0x0FF" end="0x0FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x100" end="0x103" rtqmask="0x00F"          />
   <memory name="config"             start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x104" end="0x104" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" >
-    <mask name="IOSCFS" value="0x001" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" >
+    <tqmask name="IOSCFS" value="0x001" >
       <value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" />
       <value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="MCPU"   value="0x002" >
+    </tqmask>
+    <tqmask name="MCPU"   value="0x002" >
       <value value="0x000" name="On"  cname="_MCPU_ON"  />
       <value value="0x002" name="Off" cname="_MCPU_OFF" />
-    </mask>
-    <mask name="WDT"    value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"     value="0x008" >
+    </tqmask>
+    <tqmask name="CP"     value="0x008" >
       <value value="0x000" name="040:0FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F222.xml b/src/devices/pic/xml_data/10F222.xml
index 4cba906..3597849 100644
--- a/src/devices/pic/xml_data/10F222.xml
+++ b/src/devices/pic/xml_data/10F222.xml
@@ -28,33 +28,33 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x1FE" />
-  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x200" end="0x203" rmask="0x00F"          />
+  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x200" end="0x203" rtqmask="0x00F"          />
   <memory name="config"             start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x204" end="0x204" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" >
-    <mask name="IOSCFS" value="0x001" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" >
+    <tqmask name="IOSCFS" value="0x001" >
       <value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" />
       <value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="MCPU"   value="0x002" >
+    </tqmask>
+    <tqmask name="MCPU"   value="0x002" >
       <value value="0x000" name="On"  cname="_MCPU_ON"  />
       <value value="0x002" name="Off" cname="_MCPU_OFF" />
-    </mask>
-    <mask name="WDT"    value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"     value="0x008" >
+    </tqmask>
+    <tqmask name="CP"     value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C508.xml b/src/devices/pic/xml_data/12C508.xml
index cb39eae..2639704 100644
--- a/src/devices/pic/xml_data/12C508.xml
+++ b/src/devices/pic/xml_data/12C508.xml
@@ -30,30 +30,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x1FE" />
-  <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x200" end="0x203" rmask="0x00F"      />
+  <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x200" end="0x203" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C508A.xml b/src/devices/pic/xml_data/12C508A.xml
index f1ffb3f..a5c9497 100644
--- a/src/devices/pic/xml_data/12C508A.xml
+++ b/src/devices/pic/xml_data/12C508A.xml
@@ -27,30 +27,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x1FE" />
-  <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x200" end="0x203" rmask="0x00F"      />
+  <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x200" end="0x203" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C509.xml b/src/devices/pic/xml_data/12C509.xml
index dbe885b..7b10e99 100644
--- a/src/devices/pic/xml_data/12C509.xml
+++ b/src/devices/pic/xml_data/12C509.xml
@@ -30,30 +30,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x3FE" />
-  <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x400" end="0x403" rmask="0x00F"      />
+  <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x400" end="0x403" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C509A.xml b/src/devices/pic/xml_data/12C509A.xml
index 240783f..0c41121 100644
--- a/src/devices/pic/xml_data/12C509A.xml
+++ b/src/devices/pic/xml_data/12C509A.xml
@@ -27,30 +27,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x3FE" />
-  <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x400" end="0x403" rmask="0x00F"      />
+  <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x400" end="0x403" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C671.xml b/src/devices/pic/xml_data/12C671.xml
index f675723..bcb6217 100644
--- a/src/devices/pic/xml_data/12C671.xml
+++ b/src/devices/pic/xml_data/12C671.xml
@@ -35,13 +35,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x03FE" />
-  <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x000F"      />
+  <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x000F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -50,24 +50,24 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0080" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0080" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0080" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F60" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F60" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1520" name="200:3FE" cname="_CP_75"  />
       <value value="default" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C672.xml b/src/devices/pic/xml_data/12C672.xml
index 80511f1..17e100c 100644
--- a/src/devices/pic/xml_data/12C672.xml
+++ b/src/devices/pic/xml_data/12C672.xml
@@ -36,13 +36,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x07FE" />
-  <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x000F"      />
+  <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x000F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,25 +51,25 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0080" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0080" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0080" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F60" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F60" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1520" name="200:7FE" cname="_CP_75"  />
       <value value="0x2A40" name="400:7FE" cname="_CP_50"  />
       <value value="default" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE518.xml b/src/devices/pic/xml_data/12CE518.xml
index e27cbb3..619dadc 100644
--- a/src/devices/pic/xml_data/12CE518.xml
+++ b/src/devices/pic/xml_data/12CE518.xml
@@ -27,31 +27,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x1FE" />
-  <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x200" end="0x203" rmask="0x00F"      />
+  <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x200" end="0x203" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
-  <memory name="eeprom"      start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" />
+  <memory name="eeprom"      start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE519.xml b/src/devices/pic/xml_data/12CE519.xml
index 210e186..483a926 100644
--- a/src/devices/pic/xml_data/12CE519.xml
+++ b/src/devices/pic/xml_data/12CE519.xml
@@ -27,31 +27,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x3FE" />
-  <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x400" end="0x403" rmask="0x00F"      />
+  <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x400" end="0x403" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
-  <memory name="eeprom"      start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" />
+  <memory name="eeprom"      start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE673.xml b/src/devices/pic/xml_data/12CE673.xml
index 3007c29..4d8ea34 100644
--- a/src/devices/pic/xml_data/12CE673.xml
+++ b/src/devices/pic/xml_data/12CE673.xml
@@ -35,14 +35,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x03FE" />
-  <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x000F"      />
+  <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x000F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
   <memory name="eeprom"      start="0x0000" end="0x000F" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,24 +51,24 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0080" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0080" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0080" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F60" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F60" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1520" name="200:3FE" cname="_CP_75"  />
       <value value="default" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE674.xml b/src/devices/pic/xml_data/12CE674.xml
index 7670f3f..2f9198a 100644
--- a/src/devices/pic/xml_data/12CE674.xml
+++ b/src/devices/pic/xml_data/12CE674.xml
@@ -36,14 +36,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x07FE" />
-  <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x000F"      />
+  <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x000F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
   <memory name="eeprom"      start="0x0000" end="0x000F" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -52,25 +52,25 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0080" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0080" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0080" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F60" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F60" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1520" name="200:7FE" cname="_CP_75"  />
       <value value="0x2A40" name="400:7FE" cname="_CP_50"  />
       <value value="default" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CR509A.xml b/src/devices/pic/xml_data/12CR509A.xml
index 9a795da..80d4d36 100644
--- a/src/devices/pic/xml_data/12CR509A.xml
+++ b/src/devices/pic/xml_data/12CR509A.xml
@@ -27,30 +27,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x3FE" />
-  <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x400" end="0x403" rmask="0x00F"      />
+  <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x400" end="0x403" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F508.xml b/src/devices/pic/xml_data/12F508.xml
index 19fd956..4bd60df 100644
--- a/src/devices/pic/xml_data/12F508.xml
+++ b/src/devices/pic/xml_data/12F508.xml
@@ -29,31 +29,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x1FE" />
-  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x200" end="0x203" rmask="0x00F"          />
+  <memory name="calibration"        start="0x1FF" end="0x1FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x200" end="0x203" rtqmask="0x00F"          />
   <memory name="config"             start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x204" end="0x204" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:1FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F509.xml b/src/devices/pic/xml_data/12F509.xml
index 8f3ae12..449e009 100644
--- a/src/devices/pic/xml_data/12F509.xml
+++ b/src/devices/pic/xml_data/12F509.xml
@@ -29,31 +29,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x3FE" />
-  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x400" end="0x403" rmask="0x00F"          />
+  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x400" end="0x403" rtqmask="0x00F"          />
   <memory name="config"             start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x404" end="0x404" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
-    <mask name="FOSC"  value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+    <tqmask name="FOSC"  value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x008" >
+    </tqmask>
+    <tqmask name="CP"    value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F510.xml b/src/devices/pic/xml_data/12F510.xml
index 15a2d81..ce2ab4a 100644
--- a/src/devices/pic/xml_data/12F510.xml
+++ b/src/devices/pic/xml_data/12F510.xml
@@ -28,35 +28,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x3FE" />
-  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x400" end="0x403" rmask="0x00F"          />
+  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x400" end="0x403" rtqmask="0x00F"          />
   <memory name="config"             start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x404" end="0x404" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" >
-    <mask name="FOSC"   value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" >
+    <tqmask name="FOSC"   value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"    value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"     value="0x008" >
+    </tqmask>
+    <tqmask name="CP"     value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="IOSCFS" value="0x020" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x020" >
       <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
       <value value="0x020" name="8MHZ" cname="_IOSCFS_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F519.xml b/src/devices/pic/xml_data/12F519.xml
index 600618c..02dd3d1 100644
--- a/src/devices/pic/xml_data/12F519.xml
+++ b/src/devices/pic/xml_data/12F519.xml
@@ -31,40 +31,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"               start="0x000" end="0x3FE" />
-  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
   <memory name="eeprom"             start="0x400" end="0x43F" />
-  <memory name="user_ids"           start="0x440" end="0x443" rmask="0x00F"          />
+  <memory name="user_ids"           start="0x440" end="0x443" rtqmask="0x00F"          />
   <memory name="config"             start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x444" end="0x444" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" >
-    <mask name="FOSC"   value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" >
+    <tqmask name="FOSC"   value="0x003" >
       <value value="0x000" name="LP"    cname="_LP_OSC"    />
       <value value="0x001" name="XT"    cname="_XT_OSC"    />
       <value value="0x002" name="INTRC" cname="_IntRC_OSC" />
       <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
-    </mask>
-    <mask name="WDT"    value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"     value="0x008" >
+    </tqmask>
+    <tqmask name="CP"     value="0x008" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x010" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x010" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x010" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="IOSCFS" value="0x020" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x020" >
       <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
       <value value="0x020" name="8MHZ" cname="_IOSCFS_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x040" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x040" >
       <value value="0x000" name="All" cname="_CPDF_ON"  />
       <value value="0x040" name="Off" cname="_CPDF_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F609.xml b/src/devices/pic/xml_data/12F609.xml
index d3409ee..07f4b1f 100644
--- a/src/devices/pic/xml_data/12F609.xml
+++ b/src/devices/pic/xml_data/12F609.xml
@@ -39,15 +39,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
-    <mask name="FOSC"   value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+    <tqmask name="FOSC"   value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -56,32 +56,32 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"    value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"     value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"     value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="IOSCFS" value="0x0080" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x0080" >
       <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
       <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="BODEN"  value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0300" >
       <value value="default" name="Off"    cname="_BOR_OFF"    />
       <value value="0x0200"  name="On_run" cname="_BOR_NSLEEP" />
       <value value="0x0300"  name="On"     cname="_BOR_ON"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F615.xml b/src/devices/pic/xml_data/12F615.xml
index d59445e..e90d419 100644
--- a/src/devices/pic/xml_data/12F615.xml
+++ b/src/devices/pic/xml_data/12F615.xml
@@ -39,15 +39,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
-    <mask name="FOSC"   value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+    <tqmask name="FOSC"   value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -56,32 +56,32 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"    value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"     value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"     value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="IOSCFS" value="0x0080" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x0080" >
       <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
       <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="BODEN"  value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0300" >
       <value value="default" name="Off"    cname="_BOR_OFF"    />
       <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"     cname="_BOR_ON"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F629.xml b/src/devices/pic/xml_data/12F629.xml
index 53c0cf4..9c4553a 100644
--- a/src/devices/pic/xml_data/12F629.xml
+++ b/src/devices/pic/xml_data/12F629.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FE" />
-  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_opmask="0x3C00"     cal_opcode="0x3400" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_optqmask="0x3C00"     cal_opcode="0x3400" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -54,37 +54,37 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0080" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0080" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BG"    value="0x3000">
+    </tqmask>
+    <tqmask name="BG"    value="0x3000">
       <value value="0x0000" name="Lowest"   />
       <value value="0x1000" name="Mid/Low"  />
       <value value="0x2000" name="Mid/High" />
       <value value="0x3000" name="Highest"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F635.xml b/src/devices/pic/xml_data/12F635.xml
index f06c3b6..3bf332d 100644
--- a/src/devices/pic/xml_data/12F635.xml
+++ b/src/devices/pic/xml_data/12F635.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,45 +48,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="WUREN" value="0x1000" >
+    </tqmask>
+    <tqmask name="WUREN" value="0x1000" >
       <value value="0x0000" name="On"  cname="_WUREN_ON"  />
       <value value="0x1000" name="Off" cname="_WUREN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F675.xml b/src/devices/pic/xml_data/12F675.xml
index 6e0f054..e226b4f 100644
--- a/src/devices/pic/xml_data/12F675.xml
+++ b/src/devices/pic/xml_data/12F675.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FE" />
-  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_opmask="0x3C00"     cal_opcode="0x3400" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_optqmask="0x3C00"     cal_opcode="0x3400" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -54,37 +54,37 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0080" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0080" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BG"    value="0x3000">
+    </tqmask>
+    <tqmask name="BG"    value="0x3000">
       <value value="0x0000" name="Lowest"   />
       <value value="0x1000" name="Mid/Low"  />
       <value value="0x2000" name="Mid/High" />
       <value value="0x3000" name="Highest"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F683.xml b/src/devices/pic/xml_data/12F683.xml
index 1c23260..d80b5c1 100644
--- a/src/devices/pic/xml_data/12F683.xml
+++ b/src/devices/pic/xml_data/12F683.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/14000.xml b/src/devices/pic/xml_data/14000.xml
index 8cf2db6..9ee23ed 100644
--- a/src/devices/pic/xml_data/14000.xml
+++ b/src/devices/pic/xml_data/14000.xml
@@ -28,40 +28,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x0FBF" />
-  <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_opmask="0x0000" cal_opcode="0x0000" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_optqmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FBD" pmask="0x0042" >
-    <mask name="FOSC"  value="0x0001" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FBD" ptqmask="0x0042" >
+    <tqmask name="FOSC"  value="0x0001" >
       <value value="0x0000" name="HS"    cname="_FOSC_HS" />
       <value value="0x0001" name="INTRC" cname="_FOSC_RC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="TRIM" value="0x0042" >
+    </tqmask>
+    <tqmask name="TRIM" value="0x0042" >
       <value value="0x0000" name="00" />
       <value value="0x0002" name="01" />
       <value value="0x0040" name="10" />
       <value value="0x0042" name="11" />
-    </mask>
-    <mask name="CP"    value="0x1E30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x1E30" >
       <value value="0x0000"  name="All" cname="_CPP_ON _CPU_ON"   />
       <value value="0x1E30"  name="Off" cname="_CPP_OFF _CPU_OFF" />
       <value value="default" name="invalid" />
-    </mask>
-    <mask name="CPC"   value="0x2180" >
+    </tqmask>
+    <tqmask name="CPC"   value="0x2180" >
       <value value="0x0000"  name="All" cname="_CPC_ON"  />
       <value value="0x2180"  name="Off" cname="_CPC_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C432.xml b/src/devices/pic/xml_data/16C432.xml
index e112d5c..bed76d2 100644
--- a/src/devices/pic/xml_data/16C432.xml
+++ b/src/devices/pic/xml_data/16C432.xml
@@ -29,36 +29,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C433.xml b/src/devices/pic/xml_data/16C433.xml
index cf07aaa..6dad096 100644
--- a/src/devices/pic/xml_data/16C433.xml
+++ b/src/devices/pic/xml_data/16C433.xml
@@ -29,13 +29,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x0000" end="0x07FE" />
-  <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
-  <memory name="user_ids"    start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+  <memory name="user_ids"    start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="config"      start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -44,26 +44,26 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0080" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0080" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0080" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F60" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F60" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1520" name="200:7FE" cname="_CP_75"  />
       <value value="0x2A40" name="400:7FE" cname="_CP_50"  />
       <value value="0x3F60" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C505.xml b/src/devices/pic/xml_data/16C505.xml
index 2cbe2c9..6fa7f11 100644
--- a/src/devices/pic/xml_data/16C505.xml
+++ b/src/devices/pic/xml_data/16C505.xml
@@ -35,13 +35,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"     start="0x000" end="0x3FE" />
-  <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
-  <memory name="user_ids"    start="0x400" end="0x403" rmask="0x00F"      />
+  <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+  <memory name="user_ids"    start="0x400" end="0x403" rtqmask="0x00F"      />
   <memory name="config"      start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0xFFF" >
-    <mask name="FOSC"  value="0x007" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0xFFF" >
+    <tqmask name="FOSC"  value="0x007" >
       <value value="0x000" name="LP"           cname="_LP_OSC"             />
       <value value="0x001" name="XT"           cname="_XT_OSC"             />
       <value value="0x002" name="HS"           cname="_HS_OSC"             />
@@ -50,20 +50,20 @@
       <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
       <value value="0x006" name="EXTRC_IO"     cname="_ExtRC_OSC_RB4EN"    />
       <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
-    </mask>
-    <mask name="WDT"   value="0x008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x008" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x020" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0xFD0" >
+    </tqmask>
+    <tqmask name="CP"    value="0xFD0" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0xFD0" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C52.xml b/src/devices/pic/xml_data/16C52.xml
index 6ef7753..f9c1a59 100644
--- a/src/devices/pic/xml_data/16C52.xml
+++ b/src/devices/pic/xml_data/16C52.xml
@@ -30,16 +30,16 @@
   <memory name="config"  start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x008" bvalue="0x00B" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x008" bvalue="0x00B" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="default" name="invalid" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54.xml b/src/devices/pic/xml_data/16C54.xml
index 06455ee..2620238 100644
--- a/src/devices/pic/xml_data/16C54.xml
+++ b/src/devices/pic/xml_data/16C54.xml
@@ -36,25 +36,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54A.xml b/src/devices/pic/xml_data/16C54A.xml
index c264f10..ae365d8 100644
--- a/src/devices/pic/xml_data/16C54A.xml
+++ b/src/devices/pic/xml_data/16C54A.xml
@@ -45,26 +45,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54B.xml b/src/devices/pic/xml_data/16C54B.xml
index d20ae0e..da0ae9a 100644
--- a/src/devices/pic/xml_data/16C54B.xml
+++ b/src/devices/pic/xml_data/16C54B.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54C.xml b/src/devices/pic/xml_data/16C54C.xml
index 0d1907b..629d54e 100644
--- a/src/devices/pic/xml_data/16C54C.xml
+++ b/src/devices/pic/xml_data/16C54C.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C55.xml b/src/devices/pic/xml_data/16C55.xml
index 0d93443..30d2d4e 100644
--- a/src/devices/pic/xml_data/16C55.xml
+++ b/src/devices/pic/xml_data/16C55.xml
@@ -36,25 +36,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C554.xml b/src/devices/pic/xml_data/16C554.xml
index 1723220..42bb60f 100644
--- a/src/devices/pic/xml_data/16C554.xml
+++ b/src/devices/pic/xml_data/16C554.xml
@@ -38,30 +38,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F"  >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F"  >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F30" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C557.xml b/src/devices/pic/xml_data/16C557.xml
index 3a9ddab..0d37913 100644
--- a/src/devices/pic/xml_data/16C557.xml
+++ b/src/devices/pic/xml_data/16C557.xml
@@ -43,32 +43,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C558.xml b/src/devices/pic/xml_data/16C558.xml
index 484efee..36cd4e8 100644
--- a/src/devices/pic/xml_data/16C558.xml
+++ b/src/devices/pic/xml_data/16C558.xml
@@ -40,32 +40,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C55A.xml b/src/devices/pic/xml_data/16C55A.xml
index 27b9eac..6bcc1be 100644
--- a/src/devices/pic/xml_data/16C55A.xml
+++ b/src/devices/pic/xml_data/16C55A.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C56.xml b/src/devices/pic/xml_data/16C56.xml
index a8ec195..cddfd3e 100644
--- a/src/devices/pic/xml_data/16C56.xml
+++ b/src/devices/pic/xml_data/16C56.xml
@@ -36,25 +36,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x3FF" />
-  <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+  <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C56A.xml b/src/devices/pic/xml_data/16C56A.xml
index 0543765..6e29f70 100644
--- a/src/devices/pic/xml_data/16C56A.xml
+++ b/src/devices/pic/xml_data/16C56A.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x3FF" />
-  <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+  <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:3FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C57.xml b/src/devices/pic/xml_data/16C57.xml
index 4aef05a..4791ee9 100644
--- a/src/devices/pic/xml_data/16C57.xml
+++ b/src/devices/pic/xml_data/16C57.xml
@@ -36,25 +36,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C57C.xml b/src/devices/pic/xml_data/16C57C.xml
index 4d5f180..4477c00 100644
--- a/src/devices/pic/xml_data/16C57C.xml
+++ b/src/devices/pic/xml_data/16C57C.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C58A.xml b/src/devices/pic/xml_data/16C58A.xml
index a12abb6..e4798ce 100644
--- a/src/devices/pic/xml_data/16C58A.xml
+++ b/src/devices/pic/xml_data/16C58A.xml
@@ -45,25 +45,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C58B.xml b/src/devices/pic/xml_data/16C58B.xml
index 04f56ce..48e910e 100644
--- a/src/devices/pic/xml_data/16C58B.xml
+++ b/src/devices/pic/xml_data/16C58B.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C61.xml b/src/devices/pic/xml_data/16C61.xml
index 0b62c88..6812ee7 100644
--- a/src/devices/pic/xml_data/16C61.xml
+++ b/src/devices/pic/xml_data/16C61.xml
@@ -34,29 +34,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62.xml b/src/devices/pic/xml_data/16C62.xml
index 8eebe47..e1a3764 100644
--- a/src/devices/pic/xml_data/16C62.xml
+++ b/src/devices/pic/xml_data/16C62.xml
@@ -33,31 +33,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="200:7FF" cname="_CP_75"  />
       <value value="0x0020" name="400:7FF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C620.xml b/src/devices/pic/xml_data/16C620.xml
index 8a676af..522beaa 100644
--- a/src/devices/pic/xml_data/16C620.xml
+++ b/src/devices/pic/xml_data/16C620.xml
@@ -35,34 +35,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F30" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C620A.xml b/src/devices/pic/xml_data/16C620A.xml
index 9770da4..a36b1c6 100644
--- a/src/devices/pic/xml_data/16C620A.xml
+++ b/src/devices/pic/xml_data/16C620A.xml
@@ -39,34 +39,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F30" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C621.xml b/src/devices/pic/xml_data/16C621.xml
index 401ee06..745ba82 100644
--- a/src/devices/pic/xml_data/16C621.xml
+++ b/src/devices/pic/xml_data/16C621.xml
@@ -36,35 +36,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:3FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C621A.xml b/src/devices/pic/xml_data/16C621A.xml
index 97e136e..3e48bd4 100644
--- a/src/devices/pic/xml_data/16C621A.xml
+++ b/src/devices/pic/xml_data/16C621A.xml
@@ -40,35 +40,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:3FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C622.xml b/src/devices/pic/xml_data/16C622.xml
index f1675bc..9617071 100644
--- a/src/devices/pic/xml_data/16C622.xml
+++ b/src/devices/pic/xml_data/16C622.xml
@@ -37,36 +37,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C622A.xml b/src/devices/pic/xml_data/16C622A.xml
index 04e0d9b..26b691e 100644
--- a/src/devices/pic/xml_data/16C622A.xml
+++ b/src/devices/pic/xml_data/16C622A.xml
@@ -41,36 +41,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62A.xml b/src/devices/pic/xml_data/16C62A.xml
index 71bf13f..00c16ea 100644
--- a/src/devices/pic/xml_data/16C62A.xml
+++ b/src/devices/pic/xml_data/16C62A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62B.xml b/src/devices/pic/xml_data/16C62B.xml
index 6550cbb..749c9c8 100644
--- a/src/devices/pic/xml_data/16C62B.xml
+++ b/src/devices/pic/xml_data/16C62B.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C63.xml b/src/devices/pic/xml_data/16C63.xml
index 7d21001..16432ee 100644
--- a/src/devices/pic/xml_data/16C63.xml
+++ b/src/devices/pic/xml_data/16C63.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C63A.xml b/src/devices/pic/xml_data/16C63A.xml
index 2a3eac3..6499148 100644
--- a/src/devices/pic/xml_data/16C63A.xml
+++ b/src/devices/pic/xml_data/16C63A.xml
@@ -34,36 +34,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C64.xml b/src/devices/pic/xml_data/16C64.xml
index 2bd6f77..fa3998d 100644
--- a/src/devices/pic/xml_data/16C64.xml
+++ b/src/devices/pic/xml_data/16C64.xml
@@ -33,31 +33,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="200:7FF" cname="_CP_75"  />
       <value value="0x0020" name="400:7FF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C641.xml b/src/devices/pic/xml_data/16C641.xml
index 2a819ff..74e5fd5 100644
--- a/src/devices/pic/xml_data/16C641.xml
+++ b/src/devices/pic/xml_data/16C641.xml
@@ -28,40 +28,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="MPEEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="MPEEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="_MPEEN_OFF" />
       <value value="0x0080" name="On"  cname="_MPEEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:7FF" cname="_CP_50"  />
       <value value="0x2A20" name="200:7FF" cname="_CP_75"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C642.xml b/src/devices/pic/xml_data/16C642.xml
index c5847a9..e9bc07a 100644
--- a/src/devices/pic/xml_data/16C642.xml
+++ b/src/devices/pic/xml_data/16C642.xml
@@ -33,40 +33,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="MPEEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="MPEEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="_MPEEN_OFF" />
       <value value="0x0080" name="On"  cname="_MPEEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C64A.xml b/src/devices/pic/xml_data/16C64A.xml
index c5331e6..274da63 100644
--- a/src/devices/pic/xml_data/16C64A.xml
+++ b/src/devices/pic/xml_data/16C64A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65.xml b/src/devices/pic/xml_data/16C65.xml
index 1d5de06..13ff265 100644
--- a/src/devices/pic/xml_data/16C65.xml
+++ b/src/devices/pic/xml_data/16C65.xml
@@ -33,31 +33,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="400:FFF" cname="_CP_75"  />
       <value value="0x0020" name="800:FFF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65A.xml b/src/devices/pic/xml_data/16C65A.xml
index 4220f2d..32d4280 100644
--- a/src/devices/pic/xml_data/16C65A.xml
+++ b/src/devices/pic/xml_data/16C65A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65B.xml b/src/devices/pic/xml_data/16C65B.xml
index c5eae8a..6463d62 100644
--- a/src/devices/pic/xml_data/16C65B.xml
+++ b/src/devices/pic/xml_data/16C65B.xml
@@ -34,36 +34,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C66.xml b/src/devices/pic/xml_data/16C66.xml
index bfa3307..08f25d5 100644
--- a/src/devices/pic/xml_data/16C66.xml
+++ b/src/devices/pic/xml_data/16C66.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C661.xml b/src/devices/pic/xml_data/16C661.xml
index 612f636..36f2bd0 100644
--- a/src/devices/pic/xml_data/16C661.xml
+++ b/src/devices/pic/xml_data/16C661.xml
@@ -28,40 +28,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="MPEEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="MPEEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="_MPEEN_OFF" />
       <value value="0x0080" name="On"  cname="_MPEEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C662.xml b/src/devices/pic/xml_data/16C662.xml
index a09c5c5..ffd6fdc 100644
--- a/src/devices/pic/xml_data/16C662.xml
+++ b/src/devices/pic/xml_data/16C662.xml
@@ -33,40 +33,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="MPEEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="MPEEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="_MPEEN_OFF" />
       <value value="0x0080" name="On"  cname="_MPEEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C67.xml b/src/devices/pic/xml_data/16C67.xml
index 43c1aa1..26cbb43 100644
--- a/src/devices/pic/xml_data/16C67.xml
+++ b/src/devices/pic/xml_data/16C67.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C71.xml b/src/devices/pic/xml_data/16C71.xml
index d23acc3..e453bfa 100644
--- a/src/devices/pic/xml_data/16C71.xml
+++ b/src/devices/pic/xml_data/16C71.xml
@@ -31,29 +31,29 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C710.xml b/src/devices/pic/xml_data/16C710.xml
index d6a90c2..62b36a3 100644
--- a/src/devices/pic/xml_data/16C710.xml
+++ b/src/devices/pic/xml_data/16C710.xml
@@ -34,34 +34,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3FB0" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3FB0" >
       <value value="0x0000" name="040:1FF" cname="_CP_ON"  />
       <value value="0x3FB0" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C711.xml b/src/devices/pic/xml_data/16C711.xml
index 29518e3..b57c9f5 100644
--- a/src/devices/pic/xml_data/16C711.xml
+++ b/src/devices/pic/xml_data/16C711.xml
@@ -34,34 +34,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3FB0" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3FB0" >
       <value value="0x0000" name="040:3FF" cname="_CP_ON"  />
       <value value="0x3FB0" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C712.xml b/src/devices/pic/xml_data/16C712.xml
index 6979deb..400aa43 100644
--- a/src/devices/pic/xml_data/16C712.xml
+++ b/src/devices/pic/xml_data/16C712.xml
@@ -29,35 +29,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x2A20" name="200:3FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C715.xml b/src/devices/pic/xml_data/16C715.xml
index 501018f..8df94d0 100644
--- a/src/devices/pic/xml_data/16C715.xml
+++ b/src/devices/pic/xml_data/16C715.xml
@@ -33,40 +33,40 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="MPEEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="MPEEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="_MPEEN_OFF" />
       <value value="0x0080" name="On"  cname="_MPEEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C716.xml b/src/devices/pic/xml_data/16C716.xml
index f34e760..6885b77 100644
--- a/src/devices/pic/xml_data/16C716.xml
+++ b/src/devices/pic/xml_data/16C716.xml
@@ -32,36 +32,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C717.xml b/src/devices/pic/xml_data/16C717.xml
index 19c6f6a..9045ec7 100644
--- a/src/devices/pic/xml_data/16C717.xml
+++ b/src/devices/pic/xml_data/16C717.xml
@@ -36,13 +36,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x07FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,34 +51,34 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0007" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3300" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3300" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3300" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C72.xml b/src/devices/pic/xml_data/16C72.xml
index e6b88a2..ac7d9b7 100644
--- a/src/devices/pic/xml_data/16C72.xml
+++ b/src/devices/pic/xml_data/16C72.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C72A.xml b/src/devices/pic/xml_data/16C72A.xml
index cabb079..7eb3705 100644
--- a/src/devices/pic/xml_data/16C72A.xml
+++ b/src/devices/pic/xml_data/16C72A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73.xml b/src/devices/pic/xml_data/16C73.xml
index 78b69fa..37f92de 100644
--- a/src/devices/pic/xml_data/16C73.xml
+++ b/src/devices/pic/xml_data/16C73.xml
@@ -33,31 +33,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="400:FFF" cname="_CP_75"  />
       <value value="0x0020" name="800:FFF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73A.xml b/src/devices/pic/xml_data/16C73A.xml
index df9a672..ee67734 100644
--- a/src/devices/pic/xml_data/16C73A.xml
+++ b/src/devices/pic/xml_data/16C73A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73B.xml b/src/devices/pic/xml_data/16C73B.xml
index b2418f1..35694d2 100644
--- a/src/devices/pic/xml_data/16C73B.xml
+++ b/src/devices/pic/xml_data/16C73B.xml
@@ -34,36 +34,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74.xml b/src/devices/pic/xml_data/16C74.xml
index 091501d..9f5747e 100644
--- a/src/devices/pic/xml_data/16C74.xml
+++ b/src/devices/pic/xml_data/16C74.xml
@@ -33,31 +33,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="400:FFF" cname="_CP_75"  />
       <value value="0x0020" name="800:FFF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C745.xml b/src/devices/pic/xml_data/16C745.xml
index 1a4ab42..daf0552 100644
--- a/src/devices/pic/xml_data/16C745.xml
+++ b/src/devices/pic/xml_data/16C745.xml
@@ -29,32 +29,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="HS"        cname="_HS_OSC" />
       <value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" />
       <value value="0x0002" name="H4"        cname="_H4_OSC" />
       <value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74A.xml b/src/devices/pic/xml_data/16C74A.xml
index 0d784c9..d859fc2 100644
--- a/src/devices/pic/xml_data/16C74A.xml
+++ b/src/devices/pic/xml_data/16C74A.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74B.xml b/src/devices/pic/xml_data/16C74B.xml
index ce7274f..325fda9 100644
--- a/src/devices/pic/xml_data/16C74B.xml
+++ b/src/devices/pic/xml_data/16C74B.xml
@@ -34,36 +34,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C76.xml b/src/devices/pic/xml_data/16C76.xml
index c5819a2..7c6ed42 100644
--- a/src/devices/pic/xml_data/16C76.xml
+++ b/src/devices/pic/xml_data/16C76.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C765.xml b/src/devices/pic/xml_data/16C765.xml
index c441e17..360985e 100644
--- a/src/devices/pic/xml_data/16C765.xml
+++ b/src/devices/pic/xml_data/16C765.xml
@@ -29,32 +29,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="HS"        cname="_HS_OSC" />
       <value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" />
       <value value="0x0002" name="H4"        cname="_H4_OSC" />
       <value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C77.xml b/src/devices/pic/xml_data/16C77.xml
index f863d24..60d0a72 100644
--- a/src/devices/pic/xml_data/16C77.xml
+++ b/src/devices/pic/xml_data/16C77.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x1FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x1510" name="0800:1FFF" cname="_CP_75"  />
       <value value="0x2A20" name="1000:1FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"       cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C770.xml b/src/devices/pic/xml_data/16C770.xml
index de1d9e9..cb00a24 100644
--- a/src/devices/pic/xml_data/16C770.xml
+++ b/src/devices/pic/xml_data/16C770.xml
@@ -36,13 +36,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x07FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,34 +51,34 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0007" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3300" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3300" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3300" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C771.xml b/src/devices/pic/xml_data/16C771.xml
index 4bf7fcd..6f59244 100644
--- a/src/devices/pic/xml_data/16C771.xml
+++ b/src/devices/pic/xml_data/16C771.xml
@@ -36,13 +36,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,34 +51,34 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0007" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3300" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3300" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3300" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C773.xml b/src/devices/pic/xml_data/16C773.xml
index 1b74ed5..d5d4e06 100644
--- a/src/devices/pic/xml_data/16C773.xml
+++ b/src/devices/pic/xml_data/16C773.xml
@@ -33,42 +33,42 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3330" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3330" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1110" name="400:FFF" cname="_CP_75"  />
       <value value="0x2220" name="800:FFF" cname="_CP_50"  />
       <value value="0x3330" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C774.xml b/src/devices/pic/xml_data/16C774.xml
index 1d577ee..7915805 100644
--- a/src/devices/pic/xml_data/16C774.xml
+++ b/src/devices/pic/xml_data/16C774.xml
@@ -33,42 +33,42 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3330" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3330" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1110" name="400:FFF" cname="_CP_75"  />
       <value value="0x2220" name="800:FFF" cname="_CP_50"  />
       <value value="0x3330" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C781.xml b/src/devices/pic/xml_data/16C781.xml
index 2861a67..7533b24 100644
--- a/src/devices/pic/xml_data/16C781.xml
+++ b/src/devices/pic/xml_data/16C781.xml
@@ -32,13 +32,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x03FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -47,34 +47,34 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0007" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3300" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3300" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3300" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C782.xml b/src/devices/pic/xml_data/16C782.xml
index 6192a30..2b863ed 100644
--- a/src/devices/pic/xml_data/16C782.xml
+++ b/src/devices/pic/xml_data/16C782.xml
@@ -32,13 +32,13 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x07FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -47,34 +47,34 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0007" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C00" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C00" >
       <value value="0x0000" name="4.5" cname="_VBOR_45" />
       <value value="0x0400" name="4.2" cname="_VBOR_42" />
       <value value="0x0800" name="2.7" cname="_VBOR_27" />
       <value value="0x0C00" name="2.5" cname="_VBOR_25" />
-    </mask>
-    <mask name="CP"    value="0x3300" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3300" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3300" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C84.xml b/src/devices/pic/xml_data/16C84.xml
index 595bcd9..708ba95 100644
--- a/src/devices/pic/xml_data/16C84.xml
+++ b/src/devices/pic/xml_data/16C84.xml
@@ -25,30 +25,30 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" cmask="0x0018" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" ctqmask="0x0018" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="Off" cname="_PWRTE_OFF" />
       <value value="0x0008" name="On"  cname="_PWRTE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C923.xml b/src/devices/pic/xml_data/16C923.xml
index a670a59..3e438d2 100644
--- a/src/devices/pic/xml_data/16C923.xml
+++ b/src/devices/pic/xml_data/16C923.xml
@@ -33,32 +33,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C924.xml b/src/devices/pic/xml_data/16C924.xml
index 614ff48..a9096d1 100644
--- a/src/devices/pic/xml_data/16C924.xml
+++ b/src/devices/pic/xml_data/16C924.xml
@@ -33,32 +33,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C925.xml b/src/devices/pic/xml_data/16C925.xml
index b9c703d..c7a494f 100644
--- a/src/devices/pic/xml_data/16C925.xml
+++ b/src/devices/pic/xml_data/16C925.xml
@@ -25,36 +25,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x0010" name="000:EFF" cname="_CP_75"  />
       <value value="0x0020" name="000:7FF" cname="_CP_50"  />
       <value value="0x0030" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C926.xml b/src/devices/pic/xml_data/16C926.xml
index 4120d43..8a71ca5 100644
--- a/src/devices/pic/xml_data/16C926.xml
+++ b/src/devices/pic/xml_data/16C926.xml
@@ -25,36 +25,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x007F" cmask="0x3F3F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x007F" ctqmask="0x3F3F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0030" >
       <value value="0x0000" name="All"       cname="_CP_ALL" />
       <value value="0x0010" name="0000:1EFF" cname="_CP_75"  />
       <value value="0x0020" name="0000:0FFF" cname="_CP_50"  />
       <value value="0x0030" name="Off"       cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE623.xml b/src/devices/pic/xml_data/16CE623.xml
index 18e6848..00dbeee 100644
--- a/src/devices/pic/xml_data/16CE623.xml
+++ b/src/devices/pic/xml_data/16CE623.xml
@@ -35,35 +35,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x007F" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F30" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE624.xml b/src/devices/pic/xml_data/16CE624.xml
index 4f205a7..f480f85 100644
--- a/src/devices/pic/xml_data/16CE624.xml
+++ b/src/devices/pic/xml_data/16CE624.xml
@@ -36,36 +36,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x007F" hexfile_offset="?" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:3FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE625.xml b/src/devices/pic/xml_data/16CE625.xml
index d7aa576..9d156e9 100644
--- a/src/devices/pic/xml_data/16CE625.xml
+++ b/src/devices/pic/xml_data/16CE625.xml
@@ -37,36 +37,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54.xml_broken b/src/devices/pic/xml_data/16CR54.xml_broken
index cef44cb..e78487e 100644
--- a/src/devices/pic/xml_data/16CR54.xml_broken
+++ b/src/devices/pic/xml_data/16CR54.xml_broken
@@ -18,25 +18,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="program"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0x00C" cmask="0x008" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0x00C" ctqmask="0x008" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54A.xml b/src/devices/pic/xml_data/16CR54A.xml
index c3a5d2a..cbe7ef1 100644
--- a/src/devices/pic/xml_data/16CR54A.xml
+++ b/src/devices/pic/xml_data/16CR54A.xml
@@ -37,26 +37,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54B.xml b/src/devices/pic/xml_data/16CR54B.xml
index 43456d8..d561ca9 100644
--- a/src/devices/pic/xml_data/16CR54B.xml
+++ b/src/devices/pic/xml_data/16CR54B.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54C.xml b/src/devices/pic/xml_data/16CR54C.xml
index 3667ce3..c5d9876 100644
--- a/src/devices/pic/xml_data/16CR54C.xml
+++ b/src/devices/pic/xml_data/16CR54C.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR56A.xml b/src/devices/pic/xml_data/16CR56A.xml
index 0b28931..92ed41d 100644
--- a/src/devices/pic/xml_data/16CR56A.xml
+++ b/src/devices/pic/xml_data/16CR56A.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x3FF" />
-  <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+  <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:3FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR57B.xml b/src/devices/pic/xml_data/16CR57B.xml
index caba4c3..d4f218a 100644
--- a/src/devices/pic/xml_data/16CR57B.xml
+++ b/src/devices/pic/xml_data/16CR57B.xml
@@ -37,26 +37,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR57C.xml b/src/devices/pic/xml_data/16CR57C.xml
index 379f1bc..1bee66c 100644
--- a/src/devices/pic/xml_data/16CR57C.xml
+++ b/src/devices/pic/xml_data/16CR57C.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR58A.xml b/src/devices/pic/xml_data/16CR58A.xml
index 3841400..8834988 100644
--- a/src/devices/pic/xml_data/16CR58A.xml
+++ b/src/devices/pic/xml_data/16CR58A.xml
@@ -37,26 +37,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR58B.xml b/src/devices/pic/xml_data/16CR58B.xml
index b450e31..17b9c83 100644
--- a/src/devices/pic/xml_data/16CR58B.xml
+++ b/src/devices/pic/xml_data/16CR58B.xml
@@ -40,26 +40,26 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0xFF8" >
+    </tqmask>
+    <tqmask name="CP"   value="0xFF8" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0xFF8" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR62.xml b/src/devices/pic/xml_data/16CR62.xml
index 0b27a3c..5e18732 100644
--- a/src/devices/pic/xml_data/16CR62.xml
+++ b/src/devices/pic/xml_data/16CR62.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR620A.xml b/src/devices/pic/xml_data/16CR620A.xml
index a2e6db3..891e699 100644
--- a/src/devices/pic/xml_data/16CR620A.xml
+++ b/src/devices/pic/xml_data/16CR620A.xml
@@ -35,34 +35,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F30" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR63.xml b/src/devices/pic/xml_data/16CR63.xml
index 08d6f3f..0279f84 100644
--- a/src/devices/pic/xml_data/16CR63.xml
+++ b/src/devices/pic/xml_data/16CR63.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR64.xml b/src/devices/pic/xml_data/16CR64.xml
index e155a97..4ade4a5 100644
--- a/src/devices/pic/xml_data/16CR64.xml
+++ b/src/devices/pic/xml_data/16CR64.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR65.xml b/src/devices/pic/xml_data/16CR65.xml
index df4d3f4..b83c4e2 100644
--- a/src/devices/pic/xml_data/16CR65.xml
+++ b/src/devices/pic/xml_data/16CR65.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x0FFF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="400:FFF" cname="_CP_75"  />
       <value value="0x2A20" name="800:FFF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR72.xml b/src/devices/pic/xml_data/16CR72.xml
index efaa9f8..18ba26f 100644
--- a/src/devices/pic/xml_data/16CR72.xml
+++ b/src/devices/pic/xml_data/16CR72.xml
@@ -33,36 +33,36 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x07FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="config"   start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="CP"    value="0x3F30" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F30" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1510" name="200:7FF" cname="_CP_75"  />
       <value value="0x2A20" name="400:7FF" cname="_CP_50"  />
       <value value="0x3F30" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR73.xml b/src/devices/pic/xml_data/16CR73.xml
index 6513255..c368a1b 100644
--- a/src/devices/pic/xml_data/16CR73.xml
+++ b/src/devices/pic/xml_data/16CR73.xml
@@ -31,34 +31,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR74.xml b/src/devices/pic/xml_data/16CR74.xml
index 6fec92e..c724d90 100644
--- a/src/devices/pic/xml_data/16CR74.xml
+++ b/src/devices/pic/xml_data/16CR74.xml
@@ -31,34 +31,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR76.xml b/src/devices/pic/xml_data/16CR76.xml
index dd9916a..00576fb 100644
--- a/src/devices/pic/xml_data/16CR76.xml
+++ b/src/devices/pic/xml_data/16CR76.xml
@@ -31,34 +31,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR77.xml b/src/devices/pic/xml_data/16CR77.xml
index 661ebf0..04c6f68 100644
--- a/src/devices/pic/xml_data/16CR77.xml
+++ b/src/devices/pic/xml_data/16CR77.xml
@@ -31,34 +31,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR83.xml b/src/devices/pic/xml_data/16CR83.xml
index 01c4166..24f9ed0 100644
--- a/src/devices/pic/xml_data/16CR83.xml
+++ b/src/devices/pic/xml_data/16CR83.xml
@@ -31,35 +31,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_DP_ON"  />
       <value value="0x0080" name="Off" cname="_DP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F70" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F70" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F70" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR84.xml b/src/devices/pic/xml_data/16CR84.xml
index 5d93205..a22db42 100644
--- a/src/devices/pic/xml_data/16CR84.xml
+++ b/src/devices/pic/xml_data/16CR84.xml
@@ -31,35 +31,35 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF"  >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF"  >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_DP_ON"  />
       <value value="0x0080" name="Off" cname="_DP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3F70" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3F70" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3F70" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F505.xml b/src/devices/pic/xml_data/16F505.xml
index bbc2607..250adf4 100644
--- a/src/devices/pic/xml_data/16F505.xml
+++ b/src/devices/pic/xml_data/16F505.xml
@@ -29,14 +29,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x3FE" />
-  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x400" end="0x403" rmask="0x00F"          />
+  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x400" end="0x403" rtqmask="0x00F"          />
   <memory name="config"             start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x404" end="0x404" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" >
-    <mask name="FOSC"  value="0x007" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" >
+    <tqmask name="FOSC"  value="0x007" >
       <value value="0x000" name="LP"           cname="_LP_OSC"             />
       <value value="0x001" name="XT"           cname="_XT_OSC"             />
       <value value="0x002" name="HS"           cname="_HS_OSC"             />
@@ -45,19 +45,19 @@
       <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
       <value value="0x006" name="EXTRC_IO"     cname="_ExtRC_OSC_RB4EN"    />
       <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
-    </mask>
-    <mask name="WDT"   value="0x008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x008" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"    value="0x010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x010" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x010" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x020" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x020" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F506.xml b/src/devices/pic/xml_data/16F506.xml
index 4fa7a47..a472914 100644
--- a/src/devices/pic/xml_data/16F506.xml
+++ b/src/devices/pic/xml_data/16F506.xml
@@ -30,14 +30,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"            start="0x000" end="0x3FE" />
-  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_opmask="0xF00"     cal_opcode="0xC00" />
-  <memory name="user_ids"           start="0x400" end="0x403" rmask="0x00F"          />
+  <memory name="calibration"        start="0x3FF" end="0x3FF" cal_optqmask="0xF00"     cal_opcode="0xC00" />
+  <memory name="user_ids"           start="0x400" end="0x403" rtqmask="0x00F"          />
   <memory name="config"             start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
   <memory name="calibration_backup" start="0x404" end="0x404" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" >
-    <mask name="FOSC"   value="0x007" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" >
+    <tqmask name="FOSC"   value="0x007" >
       <value value="0x000" name="LP"           cname="_LP_OSC"             />
       <value value="0x001" name="XT"           cname="_XT_OSC"             />
       <value value="0x002" name="HS"           cname="_HS_OSC"             />
@@ -46,23 +46,23 @@
       <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
       <value value="0x006" name="EXTRC_IO"     cname="_ExtRC_OSC_RB4EN"    />
       <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
-    </mask>
-    <mask name="WDT"    value="0x008" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x008" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"     value="0x010" >
+    </tqmask>
+    <tqmask name="CP"     value="0x010" >
       <value value="0x000" name="040:3FE" cname="_CP_ON"  />
       <value value="0x010" name="Off"     cname="_CP_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x020" >
       <value value="0x000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="IOSCFS" value="0x040" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x040" >
       <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
       <value value="0x040" name="8MHZ" cname="_IOSCFS_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F54.xml b/src/devices/pic/xml_data/16F54.xml
index 4b55624..c5abd78 100644
--- a/src/devices/pic/xml_data/16F54.xml
+++ b/src/devices/pic/xml_data/16F54.xml
@@ -29,25 +29,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="040:1FF" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F57.xml b/src/devices/pic/xml_data/16F57.xml
index e84e053..26afb61 100644
--- a/src/devices/pic/xml_data/16F57.xml
+++ b/src/devices/pic/xml_data/16F57.xml
@@ -29,25 +29,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F59.xml b/src/devices/pic/xml_data/16F59.xml
index b29659a..4ecfae8 100644
--- a/src/devices/pic/xml_data/16F59.xml
+++ b/src/devices/pic/xml_data/16F59.xml
@@ -29,25 +29,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x7FF" />
-  <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+  <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="040:7FF" cname="_CP_ON"  />
       <value value="0x008" name="Off"     cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F610.xml b/src/devices/pic/xml_data/16F610.xml
index 46795b1..acf84ca 100644
--- a/src/devices/pic/xml_data/16F610.xml
+++ b/src/devices/pic/xml_data/16F610.xml
@@ -38,15 +38,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
-    <mask name="FOSC"   value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+    <tqmask name="FOSC"   value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -55,32 +55,32 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"    value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"     value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"     value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="IOSCFS" value="0x0080" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x0080" >
       <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
       <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="BODEN"  value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0300" >
       <value value="default" name="Off"    cname="_BOR_OFF"    />
       <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"     cname="_BOR_ON"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F616.xml b/src/devices/pic/xml_data/16F616.xml
index 9f8ca55..890aac4 100644
--- a/src/devices/pic/xml_data/16F616.xml
+++ b/src/devices/pic/xml_data/16F616.xml
@@ -39,15 +39,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"      />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
-    <mask name="FOSC"   value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+    <tqmask name="FOSC"   value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -56,32 +56,32 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"    value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"    value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"     value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"     value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="IOSCFS" value="0x0080" >
+    </tqmask>
+    <tqmask name="IOSCFS" value="0x0080" >
       <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
       <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
-    </mask>
-    <mask name="BODEN"  value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0300" >
       <value value="default" name="Off"    cname="_BOR_OFF"    />
       <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"     cname="_BOR_ON"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F627.xml b/src/devices/pic/xml_data/16F627.xml
index 7ce03a5..2656e1a 100644
--- a/src/devices/pic/xml_data/16F627.xml
+++ b/src/devices/pic/xml_data/16F627.xml
@@ -46,22 +46,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x03FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
   <memory name="eeprom"    start="0x0000" end="0x007F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" >
-    <mask name="WDT"   value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" >
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"  value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"  value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -70,29 +70,29 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0012" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0013" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_DATA_CP_ON"  />
       <value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3C00" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3C00" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1400" name="200:3FF" cname="_CP_75"  />
       <value value="0x3C00" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F627A.xml b/src/devices/pic/xml_data/16F627A.xml
index de43d7a..3992f2a 100644
--- a/src/devices/pic/xml_data/16F627A.xml
+++ b/src/devices/pic/xml_data/16F627A.xml
@@ -37,23 +37,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
-    <mask name="WDT"   value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"  value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"  value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"              />
       <value value="0x0001" name="XT"           cname="_XT_OSC"              />
       <value value="0x0002" name="HS"           cname="_HS_OSC"              />
@@ -62,27 +62,27 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT"   ecnames="_INTRC_OSC_CLKOUT"   />
       <value value="0x0012" name="ER_IO"        cname="_RC_OSC_NOCLKOUT"     ecnames="_ER_OSC_NOCLKOUT"    />
       <value value="0x0013" name="ER_CLKOUT"    cname="_RC_OSC_CLKOUT"       ecnames="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BOREN_ON"  ecnames="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_DATA_CP_ON"  />
       <value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F628.xml b/src/devices/pic/xml_data/16F628.xml
index fed16fa..1261707 100644
--- a/src/devices/pic/xml_data/16F628.xml
+++ b/src/devices/pic/xml_data/16F628.xml
@@ -47,22 +47,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x07FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
   <memory name="eeprom"    start="0x0000" end="0x007F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" >
-    <mask name="WDT"   value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" >
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"  value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"  value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -71,30 +71,30 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0012" name="ER_IO"        cname="_ER_OSC_NOCLKOUT"    />
       <value value="0x0013" name="ER_CLKOUT"    cname="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_DATA_CP_ON"  />
       <value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3C00" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3C00" >
       <value value="0x0000" name="All"     cname="_CP_ALL" />
       <value value="0x1400" name="200:7FF" cname="_CP_75"  />
       <value value="0x2800" name="400:7FF" cname="_CP_50"  />
       <value value="0x3C00" name="Off"     cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F628A.xml b/src/devices/pic/xml_data/16F628A.xml
index 8c5a4cc..8a194f9 100644
--- a/src/devices/pic/xml_data/16F628A.xml
+++ b/src/devices/pic/xml_data/16F628A.xml
@@ -37,23 +37,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
-    <mask name="WDT"   value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"  value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"  value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"              />
       <value value="0x0001" name="XT"           cname="_XT_OSC"              />
       <value value="0x0002" name="HS"           cname="_HS_OSC"              />
@@ -62,27 +62,27 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT"   ecnames="_INTRC_OSC_CLKOUT"   />
       <value value="0x0012" name="ER_IO"        cname="_RC_OSC_NOCLKOUT"     ecnames="_ER_OSC_NOCLKOUT"    />
       <value value="0x0013" name="ER_CLKOUT"    cname="_RC_OSC_CLKOUT"       ecnames="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BOREN_ON"  ecnames="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_DATA_CP_ON"  />
       <value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F630.xml b/src/devices/pic/xml_data/16F630.xml
index a82ffdb..2096457 100644
--- a/src/devices/pic/xml_data/16F630.xml
+++ b/src/devices/pic/xml_data/16F630.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FE" />
-  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_opmask="0x3C00"     cal_opcode="0x3400" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_optqmask="0x3C00"     cal_opcode="0x3400" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -54,37 +54,37 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN"     />
-    </mask>
-    <mask name="CP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0080" >
       <value value="0x0000" name="All" cname="_CP"     />
       <value value="0x0080" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD"     />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BG"    value="0x3000">
+    </tqmask>
+    <tqmask name="BG"    value="0x3000">
       <value value="0x0000" name="Lowest"   />
       <value value="0x1000" name="Mid/Low"  />
       <value value="0x2000" name="Mid/High" />
       <value value="0x3000" name="Highest"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F631.xml b/src/devices/pic/xml_data/16F631.xml
index e6a5274..9a0bb10 100644
--- a/src/devices/pic/xml_data/16F631.xml
+++ b/src/devices/pic/xml_data/16F631.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F636.xml b/src/devices/pic/xml_data/16F636.xml
index e47314e..d996191 100644
--- a/src/devices/pic/xml_data/16F636.xml
+++ b/src/devices/pic/xml_data/16F636.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,45 +48,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="WUREN" value="0x1000" >
+    </tqmask>
+    <tqmask name="WUREN" value="0x1000" >
       <value value="0x0000" name="On"  cname="_WUREN_ON"  />
       <value value="0x1000" name="Off" cname="_WUREN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F639.xml b/src/devices/pic/xml_data/16F639.xml
index 7affb7b..6cb669e 100644
--- a/src/devices/pic/xml_data/16F639.xml
+++ b/src/devices/pic/xml_data/16F639.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,45 +48,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="WUREN" value="0x1000" >
+    </tqmask>
+    <tqmask name="WUREN" value="0x1000" >
       <value value="0x0000" name="On"  cname="_WUREN_ON"  />
       <value value="0x1000" name="Off" cname="_WUREN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F648A.xml b/src/devices/pic/xml_data/16F648A.xml
index 17b4f83..6ece38e 100644
--- a/src/devices/pic/xml_data/16F648A.xml
+++ b/src/devices/pic/xml_data/16F648A.xml
@@ -37,23 +37,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
-    <mask name="WDT"   value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"  value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"  value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"              />
       <value value="0x0001" name="XT"           cname="_XT_OSC"              />
       <value value="0x0002" name="HS"           cname="_HS_OSC"              />
@@ -62,27 +62,27 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT"   ecnames="_INTRC_OSC_CLKOUT"   />
       <value value="0x0012" name="ER_IO"        cname="_RC_OSC_NOCLKOUT"     ecnames="_ER_OSC_NOCLKOUT"    />
       <value value="0x0013" name="ER_CLKOUT"    cname="_RC_OSC_CLKOUT"       ecnames="_ER_OSC_CLKOUT"      />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BOREN_ON"  ecnames="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_DATA_CP_ON"  />
       <value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F676.xml b/src/devices/pic/xml_data/16F676.xml
index b608d48..6dc78bc 100644
--- a/src/devices/pic/xml_data/16F676.xml
+++ b/src/devices/pic/xml_data/16F676.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FE" />
-  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_opmask="0x3C00"     cal_opcode="0x3400" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x03FF" end="0x03FF" cal_optqmask="0x3C00"     cal_opcode="0x3400" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -54,37 +54,37 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN"     />
-    </mask>
-    <mask name="CP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0080" >
       <value value="0x0000" name="All" cname="_CP"     />
       <value value="0x0080" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD"     />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BG"    value="0x3000">
+    </tqmask>
+    <tqmask name="BG"    value="0x3000">
       <value value="0x0000" name="Lowest"   />
       <value value="0x1000" name="Mid/Low"  />
       <value value="0x2000" name="Mid/High" />
       <value value="0x3000" name="Highest"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F677.xml b/src/devices/pic/xml_data/16F677.xml
index d27b2eb..f819715 100644
--- a/src/devices/pic/xml_data/16F677.xml
+++ b/src/devices/pic/xml_data/16F677.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F684.xml b/src/devices/pic/xml_data/16F684.xml
index f330925..c620fc1 100644
--- a/src/devices/pic/xml_data/16F684.xml
+++ b/src/devices/pic/xml_data/16F684.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F685.xml b/src/devices/pic/xml_data/16F685.xml
index aa35aa3..a0c5713 100644
--- a/src/devices/pic/xml_data/16F685.xml
+++ b/src/devices/pic/xml_data/16F685.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F687.xml b/src/devices/pic/xml_data/16F687.xml
index 2e58780..093f879 100644
--- a/src/devices/pic/xml_data/16F687.xml
+++ b/src/devices/pic/xml_data/16F687.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F688.xml b/src/devices/pic/xml_data/16F688.xml
index 2692159..bde2461 100644
--- a/src/devices/pic/xml_data/16F688.xml
+++ b/src/devices/pic/xml_data/16F688.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F689.xml b/src/devices/pic/xml_data/16F689.xml
index f22fdcd..af0651f 100644
--- a/src/devices/pic/xml_data/16F689.xml
+++ b/src/devices/pic/xml_data/16F689.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F690.xml b/src/devices/pic/xml_data/16F690.xml
index 7a51bac..f606062 100644
--- a/src/devices/pic/xml_data/16F690.xml
+++ b/src/devices/pic/xml_data/16F690.xml
@@ -30,16 +30,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -48,41 +48,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F716.xml b/src/devices/pic/xml_data/16F716.xml
index 8ebaa00..d0cc586 100644
--- a/src/devices/pic/xml_data/16F716.xml
+++ b/src/devices/pic/xml_data/16F716.xml
@@ -36,39 +36,39 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x20CF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x20CF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BOREN_ON"  ecnames="_BODEN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0080" >
       <value value="0x0000" name="2.5" cname="_VBOR_25" />
       <value value="0x0080" name="4.0" cname="_VBOR_40" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ON"  ecnames="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F72.xml b/src/devices/pic/xml_data/16F72.xml
index d49b2cd..a8c789d 100644
--- a/src/devices/pic/xml_data/16F72.xml
+++ b/src/devices/pic/xml_data/16F72.xml
@@ -34,34 +34,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x07FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F73.xml b/src/devices/pic/xml_data/16F73.xml
index 157cb74..8659896 100644
--- a/src/devices/pic/xml_data/16F73.xml
+++ b/src/devices/pic/xml_data/16F73.xml
@@ -25,34 +25,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F737.xml b/src/devices/pic/xml_data/16F737.xml
index 0184aa9..c17c0f8 100644
--- a/src/devices/pic/xml_data/16F737.xml
+++ b/src/devices/pic/xml_data/16F737.xml
@@ -34,22 +34,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -58,48 +58,48 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_0" />
       <value value="0x0040" name="On"  cname="_BOREN_1" />
-    </mask>
-    <mask name="BORV"   value="0x0180" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0180" >
       <value value="0x0000" name="4.5" cname="_VBOR_4_5" />
       <value value="0x0080" name="4.2" cname="_VBOR_4_2" />
       <value value="0x0100" name="2.7" cname="_VBOR_2_7" />
       <value value="0x0180" name="2.0" cname="_VBOR_2_0" />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP2MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP2MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP2_RB3" />
       <value value="0x1000" name="RC1" cname="_CCP2_RC1" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
-    <mask name="FCMEN"  value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+    <tqmask name="FCMEN"  value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"   value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"   value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="BORSEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BORSEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BORSEN_0" />
       <value value="0x0040" name="On"  cname="_BORSEN_1" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F74.xml b/src/devices/pic/xml_data/16F74.xml
index fc2b312..7bfc1b3 100644
--- a/src/devices/pic/xml_data/16F74.xml
+++ b/src/devices/pic/xml_data/16F74.xml
@@ -25,34 +25,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F747.xml b/src/devices/pic/xml_data/16F747.xml
index ec03640..1200a6c 100644
--- a/src/devices/pic/xml_data/16F747.xml
+++ b/src/devices/pic/xml_data/16F747.xml
@@ -34,22 +34,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -58,48 +58,48 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_0" />
       <value value="0x0040" name="On"  cname="_BOREN_1" />
-    </mask>
-    <mask name="BORV"   value="0x0180" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0180" >
       <value value="0x0000" name="4.5" cname="_VBOR_4_5" />
       <value value="0x0080" name="4.2" cname="_VBOR_4_2" />
       <value value="0x0100" name="2.7" cname="_VBOR_2_7" />
       <value value="0x0180" name="2.0" cname="_VBOR_2_0" />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP2MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP2MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP2_RB3" />
       <value value="0x1000" name="RC1" cname="_CCP2_RC1" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
-    <mask name="FCMEN"  value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+    <tqmask name="FCMEN"  value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"   value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"   value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="BORSEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BORSEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BORSEN_0" />
       <value value="0x0040" name="On"  cname="_BORSEN_1" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F76.xml b/src/devices/pic/xml_data/16F76.xml
index 3b6fcf3..8fde14a 100644
--- a/src/devices/pic/xml_data/16F76.xml
+++ b/src/devices/pic/xml_data/16F76.xml
@@ -25,34 +25,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F767.xml b/src/devices/pic/xml_data/16F767.xml
index 77ed134..0dc2c9f 100644
--- a/src/devices/pic/xml_data/16F767.xml
+++ b/src/devices/pic/xml_data/16F767.xml
@@ -34,22 +34,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -58,48 +58,48 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_0" />
       <value value="0x0040" name="On"  cname="_BOREN_1" />
-    </mask>
-    <mask name="BORV"   value="0x0180" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0180" >
       <value value="0x0000" name="4.5" cname="_VBOR_4_5" />
       <value value="0x0080" name="4.2" cname="_VBOR_4_2" />
       <value value="0x0100" name="2.7" cname="_VBOR_2_7" />
       <value value="0x0180" name="2.0" cname="_VBOR_2_0" />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP2MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP2MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP2_RB3" />
       <value value="0x1000" name="RC1" cname="_CCP2_RC1" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
-    <mask name="FCMEN"  value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+    <tqmask name="FCMEN"  value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"   value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"   value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="BORSEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BORSEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BORSEN_0" />
       <value value="0x0040" name="On"  cname="_BORSEN_1" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F77.xml b/src/devices/pic/xml_data/16F77.xml
index e02e2cb..b17a20a 100644
--- a/src/devices/pic/xml_data/16F77.xml
+++ b/src/devices/pic/xml_data/16F77.xml
@@ -25,34 +25,34 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x000F" />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  ecnames="_WDTEN_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  ecnames="_PWRTEN_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
-    </mask>
-    <mask name="CP"    value="0x0010" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0010" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x0010" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  ecnames="_BOREN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F777.xml b/src/devices/pic/xml_data/16F777.xml
index 71899b2..54f6eb3 100644
--- a/src/devices/pic/xml_data/16F777.xml
+++ b/src/devices/pic/xml_data/16F777.xml
@@ -34,22 +34,22 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -58,48 +58,48 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BOREN_0" />
       <value value="0x0040" name="On"  cname="_BOREN_1" />
-    </mask>
-    <mask name="BORV"   value="0x0180" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0180" >
       <value value="0x0000" name="4.5" cname="_VBOR_4_5" />
       <value value="0x0080" name="4.2" cname="_VBOR_4_2" />
       <value value="0x0100" name="2.7" cname="_VBOR_2_7" />
       <value value="0x0180" name="2.0" cname="_VBOR_2_0" />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP2MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP2MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP2_RB3" />
       <value value="0x1000" name="RC1" cname="_CCP2_RC1" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
-    <mask name="FCMEN"  value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+    <tqmask name="FCMEN"  value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"   value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"   value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="BORSEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BORSEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BORSEN_0" />
       <value value="0x0040" name="On"  cname="_BORSEN_1" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F785.xml b/src/devices/pic/xml_data/16F785.xml
index 80c9091..29fd083 100644
--- a/src/devices/pic/xml_data/16F785.xml
+++ b/src/devices/pic/xml_data/16F785.xml
@@ -38,16 +38,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -56,41 +56,41 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    ecnames="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBOREN" ecnames="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" ecnames="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     ecnames="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F818.xml b/src/devices/pic/xml_data/16F818.xml
index 0ff73b5..86d9f5b 100644
--- a/src/devices/pic/xml_data/16F818.xml
+++ b/src/devices/pic/xml_data/16F818.xml
@@ -35,23 +35,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x03FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -60,41 +60,41 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"    value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"    value="0x0600" >
       <value value="0x0000" name="invalid" />
       <value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" />
       <value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512"  />
       <value value="0x0600" name="Off"     cname="_WRT_ENABLE_OFF"  />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP1MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP1MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP1_RB3" />
       <value value="0x1000" name="RB2" cname="_CCP1_RB2" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F819.xml b/src/devices/pic/xml_data/16F819.xml
index e7ee0a6..76d1de1 100644
--- a/src/devices/pic/xml_data/16F819.xml
+++ b/src/devices/pic/xml_data/16F819.xml
@@ -35,23 +35,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -60,41 +60,41 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"    value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"    value="0x0600" >
       <value value="0x0000" name="000:5FF" cname="_WRT_ENABLE_1536" />
       <value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" />
       <value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512"  />
       <value value="0x0600" name="Off"     cname="_WRT_ENABLE_OFF"  />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP1MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP1MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP1_RB3" />
       <value value="0x1000" name="RB2" cname="_CCP1_RB2" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F83.xml b/src/devices/pic/xml_data/16F83.xml
index 25b80a3..ff9af73 100644
--- a/src/devices/pic/xml_data/16F83.xml
+++ b/src/devices/pic/xml_data/16F83.xml
@@ -31,31 +31,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x01FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3FF0" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3FF0" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3FF0" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F84.xml b/src/devices/pic/xml_data/16F84.xml
index 62c1f8d..88cd1ae 100644
--- a/src/devices/pic/xml_data/16F84.xml
+++ b/src/devices/pic/xml_data/16F84.xml
@@ -31,31 +31,31 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x0000" end="0x03FF" />
-  <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="config"   start="0x2007" end="0x2007" />
   <memory name="eeprom"   start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3FF0" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3FF0" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3FF0" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F84A.xml b/src/devices/pic/xml_data/16F84A.xml
index ffffba1..a179de1 100644
--- a/src/devices/pic/xml_data/16F84A.xml
+++ b/src/devices/pic/xml_data/16F84A.xml
@@ -32,32 +32,32 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x0000" end="0x03FF" />
-  <memory name="user_ids"  start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"  start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id" start="0x2006" end="0x2006" />
   <memory name="config"    start="0x2007" end="0x2007" />
   <memory name="eeprom"    start="0x0000" end="0x003F" hexfile_offset="0x2100" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3FF0" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3FF0" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x3FF0" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F87.xml b/src/devices/pic/xml_data/16F87.xml
index 835b481..987ef0c 100644
--- a/src/devices/pic/xml_data/16F87.xml
+++ b/src/devices/pic/xml_data/16F87.xml
@@ -34,23 +34,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -59,52 +59,52 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"    value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"    value="0x0600" >
       <value value="0x0000" name="All"     cname="_WRT_PROTECT_ALL"  />
       <value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" />
       <value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256"  />
       <value value="0x0600" name="Off"     cname="_WRT_PROTECT_OFF"  />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP1MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP1MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP1_RB3" />
       <value value="0x1000" name="RB0" cname="_CCP1_RB0" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" >
-    <mask name="FCMEN" value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" >
+    <tqmask name="FCMEN" value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F870.xml b/src/devices/pic/xml_data/16F870.xml
index ec66b54..005a948 100644
--- a/src/devices/pic/xml_data/16F870.xml
+++ b/src/devices/pic/xml_data/16F870.xml
@@ -36,53 +36,53 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x003F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3030" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F871.xml b/src/devices/pic/xml_data/16F871.xml
index 8b918ca..ddfd932 100644
--- a/src/devices/pic/xml_data/16F871.xml
+++ b/src/devices/pic/xml_data/16F871.xml
@@ -36,53 +36,53 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x003F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3030" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F872.xml b/src/devices/pic/xml_data/16F872.xml
index 7702922..da5fe20 100644
--- a/src/devices/pic/xml_data/16F872.xml
+++ b/src/devices/pic/xml_data/16F872.xml
@@ -36,53 +36,53 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x003F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x3030" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F873.xml b/src/devices/pic/xml_data/16F873.xml
index 4bbb1cb..b010152 100644
--- a/src/devices/pic/xml_data/16F873.xml
+++ b/src/devices/pic/xml_data/16F873.xml
@@ -41,55 +41,55 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All"       cname="_CP_ALL"       />
       <value value="0x1010" name="0800:0FFF" cname="_CP_HALF"      />
       <value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" />
       <value value="0x3030" name="Off"       cname="_CP_OFF"       />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F873A.xml b/src/devices/pic/xml_data/16F873A.xml
index ee26828..e9dd61a 100644
--- a/src/devices/pic/xml_data/16F873A.xml
+++ b/src/devices/pic/xml_data/16F873A.xml
@@ -35,54 +35,54 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F" />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0600" >
       <value value="0x0000" name="0000:07FF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F874.xml b/src/devices/pic/xml_data/16F874.xml
index fe20128..7135150 100644
--- a/src/devices/pic/xml_data/16F874.xml
+++ b/src/devices/pic/xml_data/16F874.xml
@@ -41,55 +41,55 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All"       cname="_CP_ALL"       />
       <value value="0x1010" name="0800:0FFF" cname="_CP_HALF"      />
       <value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" />
       <value value="0x3030" name="Off"       cname="_CP_OFF"       />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F874A.xml b/src/devices/pic/xml_data/16F874A.xml
index c89b407..c827c6e 100644
--- a/src/devices/pic/xml_data/16F874A.xml
+++ b/src/devices/pic/xml_data/16F874A.xml
@@ -35,54 +35,54 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0600" >
       <value value="0x0000" name="0000:07FF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F876.xml b/src/devices/pic/xml_data/16F876.xml
index 19264e8..cf59664 100644
--- a/src/devices/pic/xml_data/16F876.xml
+++ b/src/devices/pic/xml_data/16F876.xml
@@ -41,55 +41,55 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All"       cname="_CP_ALL"       />
       <value value="0x1010" name="1000:1FFF" cname="_CP_HALF"      />
       <value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" />
       <value value="0x3030" name="Off"       cname="_CP_OFF"       />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F876A.xml b/src/devices/pic/xml_data/16F876A.xml
index f1c23ce..11b3214 100644
--- a/src/devices/pic/xml_data/16F876A.xml
+++ b/src/devices/pic/xml_data/16F876A.xml
@@ -35,54 +35,54 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF">
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF">
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0600" >
       <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F877.xml b/src/devices/pic/xml_data/16F877.xml
index f83da05..d9e65fc 100644
--- a/src/devices/pic/xml_data/16F877.xml
+++ b/src/devices/pic/xml_data/16F877.xml
@@ -41,55 +41,55 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0200" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0200" >
       <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
       <value value="0x0200" name="All" cname="_WRT_ENABLE_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x3030" >
+    </tqmask>
+    <tqmask name="CP"    value="0x3030" >
       <value value="0x0000" name="All"       cname="_CP_ALL"       />
       <value value="0x1010" name="1000:1FFF" cname="_CP_HALF"      />
       <value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" />
       <value value="0x3030" name="Off"       cname="_CP_OFF"       />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F877A.xml b/src/devices/pic/xml_data/16F877A.xml
index 3a16d77..b47b113 100644
--- a/src/devices/pic/xml_data/16F877A.xml
+++ b/src/devices/pic/xml_data/16F877A.xml
@@ -35,54 +35,54 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LP_OSC" />
       <value value="0x0001" name="XT"           cname="_XT_OSC" />
       <value value="0x0002" name="HS"           cname="_HS_OSC" />
       <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"   value="0x0004" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"   value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"   value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"   value="0x0600" >
       <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
-    <mask name="DEBUG" value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CP"    value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"    value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F88.xml b/src/devices/pic/xml_data/16F88.xml
index b2325c3..09fd755 100644
--- a/src/devices/pic/xml_data/16F88.xml
+++ b/src/devices/pic/xml_data/16F88.xml
@@ -32,23 +32,23 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="WDT"    value="0x0004" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="WDT"    value="0x0004" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE"  value="0x0008" >
+    </tqmask>
+    <tqmask name="PWRTE"  value="0x0008" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0008" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="FOSC"   value="0x0013" >
+    </tqmask>
+    <tqmask name="FOSC"   value="0x0013" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"       />
       <value value="0x0001" name="XT"           cname="_XT_OSC"       />
       <value value="0x0002" name="HS"           cname="_HS_OSC"       />
@@ -57,52 +57,52 @@
       <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
       <value value="0x0012" name="EXTRC_IO"     cname="_EXTRC_IO"     />
       <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
-    </mask>
-    <mask name="MCLRE"  value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLR_OFF" />
       <value value="0x0020" name="External" cname="_MCLR_ON"  />
-    </mask>
-    <mask name="BODEN"  value="0x0040" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0040" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x0040" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x0080" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x0080" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x0080" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="CPD"    value="0x0100" >
+    </tqmask>
+    <tqmask name="CPD"    value="0x0100" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0100" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="WRT"    value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"    value="0x0600" >
       <value value="0x0000" name="All"     cname="_WRT_PROTECT_ALL"  />
       <value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" />
       <value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256"  />
       <value value="0x0600" name="Off"     cname="_WRT_PROTECT_OFF"  />
-    </mask>
-    <mask name="DEBUG"  value="0x0800" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x0800" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x0800" name="Off" cname="_DEBUG_OFF" />
-    </mask>
-    <mask name="CCP1MX" value="0x1000" >
+    </tqmask>
+    <tqmask name="CCP1MX" value="0x1000" >
       <value value="0x0000" name="RB3" cname="_CCP1_RB3" />
       <value value="0x1000" name="RB0" cname="_CCP1_RB0" />
-    </mask>
-    <mask name="CP"     value="0x2000" >
+    </tqmask>
+    <tqmask name="CP"     value="0x2000" >
       <value value="0x0000" name="All" cname="_CP_ALL" />
       <value value="0x2000" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" >
-    <mask name="FCMEN" value="0x0001" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" >
+    <tqmask name="FCMEN" value="0x0001" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0001" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x0002" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0002" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0002" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F882.xml b/src/devices/pic/xml_data/16F882.xml
index db2c723..79cec09 100644
--- a/src/devices/pic/xml_data/16F882.xml
+++ b/src/devices/pic/xml_data/16F882.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x07FF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x007F" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x1000" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x2000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
-    <mask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+    <tqmask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </mask>
-    <mask name="WRT"  value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:03FF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:00FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="invalid" />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F883.xml b/src/devices/pic/xml_data/16F883.xml
index 1140b72..1ec6702 100644
--- a/src/devices/pic/xml_data/16F883.xml
+++ b/src/devices/pic/xml_data/16F883.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x1000" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x2000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
-    <mask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+    <tqmask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </mask>
-    <mask name="WRT"  value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:07FF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F884.xml b/src/devices/pic/xml_data/16F884.xml
index fbe9423..538d214 100644
--- a/src/devices/pic/xml_data/16F884.xml
+++ b/src/devices/pic/xml_data/16F884.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x1000" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x2000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
-    <mask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+    <tqmask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </mask>
-    <mask name="WRT"  value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:07FF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F886.xml b/src/devices/pic/xml_data/16F886.xml
index 3205cd7..fe07fe7 100644
--- a/src/devices/pic/xml_data/16F886.xml
+++ b/src/devices/pic/xml_data/16F886.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x1000" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x2000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
-    <mask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+    <tqmask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </mask>
-    <mask name="WRT"  value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F887.xml b/src/devices/pic/xml_data/16F887.xml
index 78be11e..bbfdf91 100644
--- a/src/devices/pic/xml_data/16F887.xml
+++ b/src/devices/pic/xml_data/16F887.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2009" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2009" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2008" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -51,62 +51,62 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOR_OFF"    />
       <value value="0x0100" name="Software" cname="_BOR_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOR_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOR_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="LVP"   value="0x1000" >
+    </tqmask>
+    <tqmask name="LVP"   value="0x1000" >
       <value value="0x0000" name="Off" cname="_LVP_OFF" />
       <value value="0x1000" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x2000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x2000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x2000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
-    <mask name="BORV" value="0x0100" >
+  <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+    <tqmask name="BORV" value="0x0100" >
       <value value="0x0100" name="4.0" cname="_BOR40V" />
       <value value="0x0000" name="2.1" cname="_BOR21V" />
-    </mask>
-    <mask name="WRT"  value="0x0600" >
+    </tqmask>
+    <tqmask name="WRT"  value="0x0600" >
       <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF"    />
       <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
       <value value="0x0400" name="0000:00FF" cname="_WRT_256"     />
       <value value="0x0600" name="Off"       cname="_WRT_OFF"     />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F913.xml b/src/devices/pic/xml_data/16F913.xml
index c904d5d..c793c72 100644
--- a/src/devices/pic/xml_data/16F913.xml
+++ b/src/devices/pic/xml_data/16F913.xml
@@ -31,16 +31,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -49,45 +49,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x1000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x1000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x1000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F914.xml b/src/devices/pic/xml_data/16F914.xml
index d74a0d5..1bdd6ad 100644
--- a/src/devices/pic/xml_data/16F914.xml
+++ b/src/devices/pic/xml_data/16F914.xml
@@ -31,16 +31,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x0FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -49,45 +49,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x1000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x1000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x1000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F916.xml b/src/devices/pic/xml_data/16F916.xml
index b066f93..f2a139a 100644
--- a/src/devices/pic/xml_data/16F916.xml
+++ b/src/devices/pic/xml_data/16F916.xml
@@ -31,16 +31,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -49,45 +49,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x1000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x1000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x1000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F917.xml b/src/devices/pic/xml_data/16F917.xml
index 9e17dcc..b2fb425 100644
--- a/src/devices/pic/xml_data/16F917.xml
+++ b/src/devices/pic/xml_data/16F917.xml
@@ -31,16 +31,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -49,45 +49,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x1000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x1000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x1000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F946.xml b/src/devices/pic/xml_data/16F946.xml
index 53df522..df3ac70 100644
--- a/src/devices/pic/xml_data/16F946.xml
+++ b/src/devices/pic/xml_data/16F946.xml
@@ -31,16 +31,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x0000" end="0x1FFF" />
-  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000"     cal_opcode="0x0000" />
-  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"          />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_optqmask="0x0000"     cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rtqmask="0x007F"          />
   <memory name="device_id"    start="0x2006" end="0x2006" />
   <memory name="config"       start="0x2007" end="0x2007" />
   <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
   <memory name="debug_vector" start="0x2004" end="0x2004" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
-    <mask name="FOSC"  value="0x0007" >
+  <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+    <tqmask name="FOSC"  value="0x0007" >
       <value value="0x0000" name="LP"           cname="_LP_OSC"             />
       <value value="0x0001" name="XT"           cname="_XT_OSC"             />
       <value value="0x0002" name="HS"           cname="_HS_OSC"             />
@@ -49,45 +49,45 @@
       <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT"   ecnames="_INTOSC"   />
       <value value="0x0006" name="EXTRC_IO"     cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO"  />
       <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT"   ecnames="_EXTRC"    />
-    </mask>
-    <mask name="WDT"   value="0x0008" >
+    </tqmask>
+    <tqmask name="WDT"   value="0x0008" >
       <value value="0x0000" name="Off" cname="_WDT_OFF" />
       <value value="0x0008" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="PWRTE" value="0x0010" >
+    </tqmask>
+    <tqmask name="PWRTE" value="0x0010" >
       <value value="0x0000" name="On"  cname="_PWRTE_ON"  />
       <value value="0x0010" name="Off" cname="_PWRTE_OFF" />
-    </mask>
-    <mask name="MCLRE" value="0x0020" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x0020" >
       <value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x0020" name="External" cname="_MCLRE_ON"  />
-    </mask>
-    <mask name="CP"    value="0x0040" >
+    </tqmask>
+    <tqmask name="CP"    value="0x0040" >
       <value value="0x0000" name="All" cname="_CP_ON"  />
       <value value="0x0040" name="Off" cname="_CP_OFF" />
-    </mask>
-    <mask name="CPD"   value="0x0080" >
+    </tqmask>
+    <tqmask name="CPD"   value="0x0080" >
       <value value="0x0000" name="All" cname="_CPD_ON"  />
       <value value="0x0080" name="Off" cname="_CPD_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x0300" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0300" >
       <value value="0x0000" name="Off"      cname="_BOD_OFF"    />
       <value value="0x0100" name="Software" cname="_BOD_SBODEN" />
       <value value="0x0200" name="On_run"   cname="_BOD_NSLEEP" />
       <value value="0x0300" name="On"       cname="_BOD_ON"     />
-    </mask>
-    <mask name="IESO"  value="0x0400" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x0400" >
       <value value="0x0000" name="Off" cname="_IESO_OFF" />
       <value value="0x0400" name="On"  cname="_IESO_ON"  />
-    </mask>
-    <mask name="FCMEN" value="0x0800" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x0800" >
       <value value="0x0000" name="Off" cname="_FCMEN_OFF" />
       <value value="0x0800" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="DEBUG" value="0x1000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x1000" >
       <value value="0x0000" name="On"  cname="_DEBUG_ON"  />
       <value value="0x1000" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16HV540.xml b/src/devices/pic/xml_data/16HV540.xml
index 439aa82..4acd802 100644
--- a/src/devices/pic/xml_data/16HV540.xml
+++ b/src/devices/pic/xml_data/16HV540.xml
@@ -28,25 +28,25 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"  start="0x000" end="0x1FF" />
-  <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+  <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
   <memory name="config"   start="0xFFF" end="0xFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
-    <mask name="FOSC" value="0x003" >
+  <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+    <tqmask name="FOSC" value="0x003" >
       <value value="0x000" name="LP"           cname="_LP_OSC" />
       <value value="0x001" name="XT"           cname="_XT_OSC" />
       <value value="0x002" name="HS"           cname="_HS_OSC" />
       <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
-    <mask name="WDT"  value="0x004" >
+    </tqmask>
+    <tqmask name="WDT"  value="0x004" >
       <value value="0x000" name="Off" cname="_WDT_OFF" />
       <value value="0x004" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="CP"   value="0x008" >
+    </tqmask>
+    <tqmask name="CP"   value="0x008" >
       <value value="0x000" name="All" cname="_CP_ON"  />
       <value value="0x008" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C42.xml b/src/devices/pic/xml_data/17C42.xml
index e072c94..7ca1e0f 100644
--- a/src/devices/pic/xml_data/17C42.xml
+++ b/src/devices/pic/xml_data/17C42.xml
@@ -30,25 +30,25 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x005F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x005F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0050" name="Microprocessor"                 cname="_MP_MODE"  />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C42A.xml b/src/devices/pic/xml_data/17C42A.xml
index 58c59b3..2c068ae 100644
--- a/src/devices/pic/xml_data/17C42A.xml
+++ b/src/devices/pic/xml_data/17C42A.xml
@@ -33,26 +33,26 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0150" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0150" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0110" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0140" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0150" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C43.xml b/src/devices/pic/xml_data/17C43.xml
index 4c91f40..b49734a 100644
--- a/src/devices/pic/xml_data/17C43.xml
+++ b/src/devices/pic/xml_data/17C43.xml
@@ -33,26 +33,26 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0150" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0150" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0110" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0140" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0150" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C44.xml b/src/devices/pic/xml_data/17C44.xml
index da4be7b..ac0d8f6 100644
--- a/src/devices/pic/xml_data/17C44.xml
+++ b/src/devices/pic/xml_data/17C44.xml
@@ -33,26 +33,26 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0150" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0150" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0110" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0140" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0150" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C752.xml b/src/devices/pic/xml_data/17C752.xml
index 20f798f..adb759c 100644
--- a/src/devices/pic/xml_data/17C752.xml
+++ b/src/devices/pic/xml_data/17C752.xml
@@ -33,30 +33,30 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:64"     cname="_WDT_64"  />
       <value value="0x0008" name="1:256"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   ecnames="_WDT_0"    />
-    </mask>
-    <mask name="BODEN" value="0x4000" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x4000" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x4000" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="PM"    value="0x8050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x8050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x8010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x8040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x8050" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C756.xml b/src/devices/pic/xml_data/17C756.xml
index a5df4c4..68b0ae7 100644
--- a/src/devices/pic/xml_data/17C756.xml
+++ b/src/devices/pic/xml_data/17C756.xml
@@ -33,30 +33,30 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:64"     cname="_WDT_64"  />
       <value value="0x0008" name="1:256"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   ecnames="_WDT_0"    />
-    </mask>
-    <mask name="BODEN" value="0x4000" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x4000" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x4000" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="PM"    value="0x8050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x8050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x8010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x8040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x8050" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C756A.xml b/src/devices/pic/xml_data/17C756A.xml
index f20ee31..39c9b81 100644
--- a/src/devices/pic/xml_data/17C756A.xml
+++ b/src/devices/pic/xml_data/17C756A.xml
@@ -33,30 +33,30 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:64"     cname="_WDT_64"  />
       <value value="0x0008" name="1:256"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   ecnames="_WDT_0"    />
-    </mask>
-    <mask name="BODEN" value="0x4000" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x4000" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x4000" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="PM"    value="0x8050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x8050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x8010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x8040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x8050" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C762.xml b/src/devices/pic/xml_data/17C762.xml
index 10e3a86..311caa6 100644
--- a/src/devices/pic/xml_data/17C762.xml
+++ b/src/devices/pic/xml_data/17C762.xml
@@ -33,30 +33,30 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:64"     cname="_WDT_64"  />
       <value value="0x0008" name="1:256"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   ecnames="_WDT_0"    />
-    </mask>
-    <mask name="BODEN" value="0x4000" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x4000" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x4000" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="PM"    value="0x8050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x8050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x8010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x8040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x8050" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C766.xml b/src/devices/pic/xml_data/17C766.xml
index 0d2559d..059decd 100644
--- a/src/devices/pic/xml_data/17C766.xml
+++ b/src/devices/pic/xml_data/17C766.xml
@@ -33,30 +33,30 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:64"     cname="_WDT_64"  />
       <value value="0x0008" name="1:256"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   ecnames="_WDT_0"    />
-    </mask>
-    <mask name="BODEN" value="0x4000" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x4000" >
       <value value="0x0000" name="Off" cname="_BODEN_OFF" />
       <value value="0x4000" name="On"  cname="_BODEN_ON"  />
-    </mask>
-    <mask name="PM"    value="0x8050" >
+    </tqmask>
+    <tqmask name="PM"    value="0x8050" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x8010" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x8040" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x8050" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17CR42.xml b/src/devices/pic/xml_data/17CR42.xml
index b691cd8..21893f8 100644
--- a/src/devices/pic/xml_data/17CR42.xml
+++ b/src/devices/pic/xml_data/17CR42.xml
@@ -33,26 +33,26 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0150" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0150" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0110" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0140" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0150" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17CR43.xml b/src/devices/pic/xml_data/17CR43.xml
index 13c1f2c..1e43eec 100644
--- a/src/devices/pic/xml_data/17CR43.xml
+++ b/src/devices/pic/xml_data/17CR43.xml
@@ -33,26 +33,26 @@
   <memory name="config"  start="0xFE00" end="0xFE00" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
-    <mask name="FOSC"  value="0x0003" >
+  <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+    <tqmask name="FOSC"  value="0x0003" >
       <value value="0x0000" name="LP"           cname="_LF_OSC" />
       <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
       <value value="0x0002" name="XT"           cname="_XT_OSC" />
       <value value="0x0003" name="EC"           cname="_EC_OSC" />
-    </mask>
-    <mask name="WDTPS" value="0x000C" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x000C" >
       <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
       <value value="0x0004" name="1:128"    cname="_WDT_64"  />
       <value value="0x0008" name="1:512"    cname="_WDT_256" />
       <value value="0x000C" name="1:1"      cname="_WDT_1"   />
-    </mask>
-    <mask name="PM"    value="0x0150" >
+    </tqmask>
+    <tqmask name="PM"    value="0x0150" >
       <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
       <value value="0x0110" name="Extended microcontroller"       cname="_XMC_MODE" />
       <value value="0x0140" name="Microcontroller"                cname="_MC_MODE"  />
       <value value="0x0150" name="Microprocessor"                 cname="_MP_MODE"  />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18C242.xml b/src/devices/pic/xml_data/18C242.xml
index 798c478..32495ab 100644
--- a/src/devices/pic/xml_data/18C242.xml
+++ b/src/devices/pic/xml_data/18C242.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x003FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,26 +90,26 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="pdip soic" nb_pins="28" >
diff --git a/src/devices/pic/xml_data/18C252.xml b/src/devices/pic/xml_data/18C252.xml
index 81f370b..d5a7161 100644
--- a/src/devices/pic/xml_data/18C252.xml
+++ b/src/devices/pic/xml_data/18C252.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x007FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,26 +90,26 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="pdip soic" nb_pins="28" >
diff --git a/src/devices/pic/xml_data/18C442.xml b/src/devices/pic/xml_data/18C442.xml
index 419ee29..5ecb3b4 100644
--- a/src/devices/pic/xml_data/18C442.xml
+++ b/src/devices/pic/xml_data/18C442.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x003FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,26 +90,26 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="pdip" nb_pins="40" >
diff --git a/src/devices/pic/xml_data/18C452.xml b/src/devices/pic/xml_data/18C452.xml
index 73e3610..5a6a07c 100644
--- a/src/devices/pic/xml_data/18C452.xml
+++ b/src/devices/pic/xml_data/18C452.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x007FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,26 +90,26 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="pdip" nb_pins="40" >
diff --git a/src/devices/pic/xml_data/18C601.xml b/src/devices/pic/xml_data/18C601.xml
index 6d41b1c..9469902 100644
--- a/src/devices/pic/xml_data/18C601.xml
+++ b/src/devices/pic/xml_data/18C601.xml
@@ -27,34 +27,34 @@
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" >
-    <mask name="FOSC" value="0x03" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" >
+    <tqmask name="FOSC" value="0x03" >
       <value value="0x00" name="LP"           cname="_LP_OSC" />
       <value value="0x01" name="EC_CLKOUT"    cname="_EC_OSC" />
       <value value="0x02" name="HS"           cname="_HS_OSC" />
       <value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BW"    value="0x40" >
+    </tqmask>
+    <tqmask name="BW"    value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8_BIT"  />
       <value value="0x40" name="16" cname="_BW_16_BIT" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -63,25 +63,25 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="0x7F"  />
       <value value="0x80" name="Off" cname="0xFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18C658.xml b/src/devices/pic/xml_data/18C658.xml
index 9ca140c..5f115ee 100644
--- a/src/devices/pic/xml_data/18C658.xml
+++ b/src/devices/pic/xml_data/18C658.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x007FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,21 +90,21 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18C801.xml b/src/devices/pic/xml_data/18C801.xml
index 3e067ad..186230c 100644
--- a/src/devices/pic/xml_data/18C801.xml
+++ b/src/devices/pic/xml_data/18C801.xml
@@ -27,34 +27,34 @@
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" >
-    <mask name="FOSC" value="0x03" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" >
+    <tqmask name="FOSC" value="0x03" >
       <value value="0x00" name="LP"           cname="_LP_OSC" />
       <value value="0x01" name="EC_CLKOUT"    cname="_EC_OSC" />
       <value value="0x02" name="HS"           cname="_HS_OSC" />
       <value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BW"    value="0x40" >
+    </tqmask>
+    <tqmask name="BW"    value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8_BIT"  />
       <value value="0x40" name="16" cname="_BW_16_BIT" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -63,25 +63,25 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="0x7F"  />
       <value value="0x80" name="Off" cname="0xFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18C858.xml b/src/devices/pic/xml_data/18C858.xml
index 7ce8087..33eb056 100644
--- a/src/devices/pic/xml_data/18C858.xml
+++ b/src/devices/pic/xml_data/18C858.xml
@@ -29,21 +29,21 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"   start="0x000000" end="0x007FFF" />
-  <memory name="user_ids"  start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"  start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"    start="0x300000" end="0x300007" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP" value="0xFF" >
+  <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP" value="0xFF" >
       <value value="0x00" name="All" cname="_CP_ON"  />
       <value value="0xFF" name="Off" cname="_CP_OFF" />
       <value value="default" name="invalid" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -52,36 +52,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -90,21 +90,21 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F1220.xml b/src/devices/pic/xml_data/18F1220.xml
index e46f7f0..1cd826b 100644
--- a/src/devices/pic/xml_data/18F1220.xml
+++ b/src/devices/pic/xml_data/18F1220.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"     sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"     sdcc_cname="_OSC_HS" />
@@ -55,40 +55,40 @@
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"   sdcc_cname="_OSC_EXT_Port_on_RA6" />
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -105,99 +105,99 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" >
-    <mask name="MCLRE" value="0x80" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" >
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_disabled_RA5_input_en" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_enabled_RA5_input_dis" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1230.xml b/src/devices/pic/xml_data/18F1230.xml
index 043687a..c84d79f 100644
--- a/src/devices/pic/xml_data/18F1230.xml
+++ b/src/devices/pic/xml_data/18F1230.xml
@@ -39,17 +39,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x00007F" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -60,42 +60,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO2" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"        />
       <value value="0x02" name="Software" cname="_BOR_SBORENCTRL" />
       <value value="0x04" name="On_run"   cname="_BOR_BOACTIVE"   />
       <value value="0x06" name="On"       cname="_BOR_BOHW"       />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -112,124 +112,124 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" >
-    <mask name="PWMPIN" value="0x02" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" >
+    <tqmask name="PWMPIN" value="0x02" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x02" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"   value="0x04" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x04" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x04" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"   value="0x08" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x08" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x08" name="high" cname="_HPOL_HIGH" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="FLTAMX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="FLTAMX"  value="0x01" >
       <value value="0x00" name="RA7" cname="_FLTAMX_RA7" />
       <value value="0x01" name="RA5" cname="_FLTAMX_RA5" />
-    </mask>
-    <mask name="T1OSCMX" value="0x08" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x08" >
       <value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" />
       <value value="0x08" name="RA6" cname="_T1OSCMX_LOW"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00"    name="256" cname="_BBSIZ_BB256" />
       <value value="default" name="512" cname="_BBSIZ_BB512" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1320.xml b/src/devices/pic/xml_data/18F1320.xml
index d4dd214..8cee921 100644
--- a/src/devices/pic/xml_data/18F1320.xml
+++ b/src/devices/pic/xml_data/18F1320.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -56,40 +56,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
       <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -106,99 +106,99 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" >
-    <mask name="MCLRE" value="0x80" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" >
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1330.xml b/src/devices/pic/xml_data/18F1330.xml
index 14130ce..fb11bbb 100644
--- a/src/devices/pic/xml_data/18F1330.xml
+++ b/src/devices/pic/xml_data/18F1330.xml
@@ -40,17 +40,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x00007F" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -61,42 +61,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO2" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"        />
       <value value="0x02" name="Software" cname="_BOR_SBORENCTRL" />
       <value value="0x04" name="On_run"   cname="_BOR_BOACTIVE"   />
       <value value="0x06" name="On"       cname="_BOR_BOHW"       />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -113,125 +113,125 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" >
-    <mask name="PWMPIN" value="0x02" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" >
+    <tqmask name="PWMPIN" value="0x02" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x02" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"   value="0x04" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x04" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x04" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"   value="0x08" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x08" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x08" name="high" cname="_HPOL_HIGH" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="FLTAMX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="FLTAMX"  value="0x01" >
       <value value="0x00" name="RA7" cname="_FLTAMX_RA7" />
       <value value="0x01" name="RA5" cname="_FLTAMX_RA5" />
-    </mask>
-    <mask name="T1OSCMX" value="0x08" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x08" >
       <value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" />
       <value value="0x08" name="RA6" cname="_T1OSCMX_LOW"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="256"  cname="_BBSIZ_BB256" />
       <value value="0x10" name="512"  cname="_BBSIZ_BB512" />
       <value value="default" name="1024" cname="_BBSIZ_BB1K"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2220.xml b/src/devices/pic/xml_data/18F2220.xml
index 43f6fbc..7ea415b 100644
--- a/src/devices/pic/xml_data/18F2220.xml
+++ b/src/devices/pic/xml_data/18F2220.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"     sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"     sdcc_cname="_OSC_HS" />
@@ -56,40 +56,40 @@
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"   sdcc_cname="_OSC_EXT_Port_on_RA6" />
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -106,107 +106,107 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN" value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN" value="0x02" >
       <value value="0x00" name="digital" cname="_PBAD_DIG" sdcc_cname="_PBADEN_PORTB_4_0__digital_I_O_on_REST" />
       <value value="0x02" name="analog"  cname="_PBAD_ANA" sdcc_cname="_PBADEN_PORTB_4_0__analog_inputs_on_RSET" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_Disabled_RE3_Enabled" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_Enabled_RE3_Disabled" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2221.xml b/src/devices/pic/xml_data/18F2221.xml
index f2a58d6..b3436d5 100644
--- a/src/devices/pic/xml_data/18F2221.xml
+++ b/src/devices/pic/xml_data/18F2221.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO2" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"   />
       <value value="0x02" name="Software" cname="_BOR_SOFT"  />
       <value value="0x04" name="On_run"   cname="_BOR_NOSLP" />
       <value value="0x06" name="On"       cname="_BOR_ON"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,119 +100,119 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_DIG" />
       <value value="0x02" name="analog"  cname="_PBADEN_ANA" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="256" cname="_BBSIZ_BB256" />
       <value value="default" name="512" cname="_BBSIZ_BB512" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="200/400:7FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"         cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2320.xml b/src/devices/pic/xml_data/18F2320.xml
index 80e8250..d17d96a 100644
--- a/src/devices/pic/xml_data/18F2320.xml
+++ b/src/devices/pic/xml_data/18F2320.xml
@@ -37,17 +37,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -59,40 +59,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
       <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -109,131 +109,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON"  />
-    </mask>
-    <mask name="PBADEN" value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN" value="0x02" >
       <value value="0x00" name="digital" cname="_PBAD_DIG" />
       <value value="0x02" name="analog"  cname="_PBAD_ANA" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_WRT3_ON"  />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_EBTR3_ON"  />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2321.xml b/src/devices/pic/xml_data/18F2321.xml
index a016fc7..f00f7dc 100644
--- a/src/devices/pic/xml_data/18F2321.xml
+++ b/src/devices/pic/xml_data/18F2321.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO2" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"   />
       <value value="0x02" name="Software" cname="_BOR_SOFT"  />
       <value value="0x04" name="On_run"   cname="_BOR_NOSLP" />
       <value value="0x06" name="On"       cname="_BOR_ON"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,120 +100,120 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_DIG" />
       <value value="0x02" name="analog"  cname="_PBADEN_ANA" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="256"  cname="_BBSIZ_BB256" />
       <value value="0x10" name="512"  cname="_BBSIZ_BB512" />
       <value value="default" name="1024" cname="_BBSIZ_BB1K"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2331.xml b/src/devices/pic/xml_data/18F2331.xml
index 46a8872..7f73a7d 100644
--- a/src/devices/pic/xml_data/18F2331.xml
+++ b/src/devices/pic/xml_data/18F2331.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -55,40 +55,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC"   />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRTEN_ON"  />
       <value value="0x01" name="Off" cname="_PWRTEN_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOREN_OFF" />
       <value value="0x02" name="On"  cname="_BOREN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDTEN_OFF" />
       <value value="0x01" name="On"  cname="_WDTEN_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDPS_4"     />
@@ -105,120 +105,120 @@
       <value value="0x1A" name="1:8192"  cname="_WDPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDPS_32768" />
-    </mask>
-    <mask name="WINEN" value="0x20" >
+    </tqmask>
+    <tqmask name="WINEN" value="0x20" >
       <value value="0x00" name="On"  cname="_WINEN_ON"  />
       <value value="0x20" name="Off" cname="_WINEN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
-    <mask name="PWMPIN"  value="0x04" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+    <tqmask name="PWMPIN"  value="0x04" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x04" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"    value="0x08" >
+    </tqmask>
+    <tqmask name="LPOL"    value="0x08" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x08" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"    value="0x10" >
+    </tqmask>
+    <tqmask name="HPOL"    value="0x10" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x10" name="high" cname="_HPOL_HIGH" />
-    </mask>
-    <mask name="T1OSCMX" value="0x20" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x20" >
       <value value="0x00" name="Legacy"    cname="_T1OSCMX_OFF" />
       <value value="0x20" name="Low Power" cname="_T1OSCMX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
-    <mask name="MCLRE" value="0x80" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2410.xml b/src/devices/pic/xml_data/18F2410.xml
index 15d6179..76968f8 100644
--- a/src/devices/pic/xml_data/18F2410.xml
+++ b/src/devices/pic/xml_data/18F2410.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -47,42 +47,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -99,107 +99,107 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F242.xml b/src/devices/pic/xml_data/18F242.xml
index d09dd83..8588203 100644
--- a/src/devices/pic/xml_data/18F242.xml
+++ b/src/devices/pic/xml_data/18F242.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -91,99 +91,99 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON"         >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON"         >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON"     >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON"     >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2420.xml b/src/devices/pic/xml_data/18F2420.xml
index aba9ace..d50dd2a 100644
--- a/src/devices/pic/xml_data/18F2420.xml
+++ b/src/devices/pic/xml_data/18F2420.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -48,42 +48,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,115 +100,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2423.xml b/src/devices/pic/xml_data/18F2423.xml
index 0905f18..29ff971 100644
--- a/src/devices/pic/xml_data/18F2423.xml
+++ b/src/devices/pic/xml_data/18F2423.xml
@@ -24,17 +24,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -45,42 +45,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -97,115 +97,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2431.xml b/src/devices/pic/xml_data/18F2431.xml
index f898f99..f162ef2 100644
--- a/src/devices/pic/xml_data/18F2431.xml
+++ b/src/devices/pic/xml_data/18F2431.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -56,40 +56,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC"   />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRTEN_ON"  />
       <value value="0x01" name="Off" cname="_PWRTEN_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOREN_OFF" />
       <value value="0x02" name="On"  cname="_BOREN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDTEN_OFF" />
       <value value="0x01" name="On"  cname="_WDTEN_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDPS_4"     />
@@ -106,120 +106,120 @@
       <value value="0x1A" name="1:8192"  cname="_WDPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDPS_32768" />
-    </mask>
-    <mask name="WINEN" value="0x20" >
+    </tqmask>
+    <tqmask name="WINEN" value="0x20" >
       <value value="0x00" name="On"  cname="_WINEN_ON"  />
       <value value="0x20" name="Off" cname="_WINEN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
-    <mask name="PWMPIN"  value="0x04" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+    <tqmask name="PWMPIN"  value="0x04" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x04" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"    value="0x08" >
+    </tqmask>
+    <tqmask name="LPOL"    value="0x08" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x08" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"    value="0x10" >
+    </tqmask>
+    <tqmask name="HPOL"    value="0x10" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x10" name="high" cname="_HPOL_HIGH" />
-    </mask>
-    <mask name="T1OSCMX" value="0x20" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x20" >
       <value value="0x00" name="Legacy"    cname="_T1OSCMX_OFF" />
       <value value="0x20" name="Low Power" cname="_T1OSCMX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
-    <mask name="MCLRE" value="0x80" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2439.xml b/src/devices/pic/xml_data/18F2439.xml
index ad389e3..edc3696 100644
--- a/src/devices/pic/xml_data/18F2439.xml
+++ b/src/devices/pic/xml_data/18F2439.xml
@@ -35,48 +35,48 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC" value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC" value="0x07" >
       <value value="default" name="invalid" />
       <value value="0x02" name="HS"        cname="_OSC_HS"    />
       <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC"    />
       <value value="0x05" name="EC_IO"     cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"        cname="_OSC_HSPLL" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -85,94 +85,94 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2450.xml b/src/devices/pic/xml_data/18F2450.xml
index 2388a92..ad3994f 100644
--- a/src/devices/pic/xml_data/18F2450.xml
+++ b/src/devices/pic/xml_data/18F2450.xml
@@ -27,14 +27,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  />
       <value value="0x06" name="10" cname="_PLLDIV_10" />
       <value value="0x07" name="12" cname="_PLLDIV_12" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" />
       <value value="0x20" name="2" cname="_USBDIV_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.6" cname="_BORV_46" />
       <value value="0x08" name="4.3" cname="_BORV_43" />
       <value value="0x10" name="2.8" cname="_BORV_28" />
       <value value="0x18" name="2.1" cname="_BORV_21" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -130,107 +130,107 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x08" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x08" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x08" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x08" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB1K" />
       <value value="0x08" name="2048" cname="_BBSIZ_BB2K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2455.xml b/src/devices/pic/xml_data/18F2455.xml
index 7097218..c42923a 100644
--- a/src/devices/pic/xml_data/18F2455.xml
+++ b/src/devices/pic/xml_data/18F2455.xml
@@ -26,15 +26,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
       <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
       <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
       <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          sdcc_cname="_OSC_HS__USB_HS" />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x18" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x18" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
       <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
       <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
       <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -130,127 +130,127 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  sdcc_cname="_ENHCPU_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F248.xml b/src/devices/pic/xml_data/18F248.xml
index 973ba90..a7078ba 100644
--- a/src/devices/pic/xml_data/18F248.xml
+++ b/src/devices/pic/xml_data/18F248.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -91,94 +91,94 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2480.xml b/src/devices/pic/xml_data/18F2480.xml
index 7f8929b..4282365 100644
--- a/src/devices/pic/xml_data/18F2480.xml
+++ b/src/devices/pic/xml_data/18F2480.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x0F" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x0F" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x06" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x06" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"        />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE"   />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"       />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,115 +106,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x02" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x02" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x10" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x10" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F24J10.xml b/src/devices/pic/xml_data/18F24J10.xml
index c4ae257..b88c8f0 100644
--- a/src/devices/pic/xml_data/18F24J10.xml
+++ b/src/devices/pic/xml_data/18F24J10.xml
@@ -31,55 +31,55 @@
   <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -96,23 +96,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2510.xml b/src/devices/pic/xml_data/18F2510.xml
index 1950de1..55c62f8 100644
--- a/src/devices/pic/xml_data/18F2510.xml
+++ b/src/devices/pic/xml_data/18F2510.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,131 +105,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2515.xml b/src/devices/pic/xml_data/18F2515.xml
index 89960ae..fa07b14 100644
--- a/src/devices/pic/xml_data/18F2515.xml
+++ b/src/devices/pic/xml_data/18F2515.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,119 +105,119 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F252.xml b/src/devices/pic/xml_data/18F252.xml
index b1d4153..595eb74 100644
--- a/src/devices/pic/xml_data/18F252.xml
+++ b/src/devices/pic/xml_data/18F252.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -92,123 +92,123 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2520.xml b/src/devices/pic/xml_data/18F2520.xml
index 3c77df0..07a97db 100644
--- a/src/devices/pic/xml_data/18F2520.xml
+++ b/src/devices/pic/xml_data/18F2520.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,139 +106,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2523.xml b/src/devices/pic/xml_data/18F2523.xml
index 6a92c8d..e630c60 100644
--- a/src/devices/pic/xml_data/18F2523.xml
+++ b/src/devices/pic/xml_data/18F2523.xml
@@ -24,17 +24,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -45,42 +45,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"   />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -97,139 +97,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2525.xml b/src/devices/pic/xml_data/18F2525.xml
index 2ff5bc7..eb2f3fe 100644
--- a/src/devices/pic/xml_data/18F2525.xml
+++ b/src/devices/pic/xml_data/18F2525.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,127 +106,127 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2539.xml b/src/devices/pic/xml_data/18F2539.xml
index 0f4a17a..8e5f2cc 100644
--- a/src/devices/pic/xml_data/18F2539.xml
+++ b/src/devices/pic/xml_data/18F2539.xml
@@ -35,48 +35,48 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC" value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC" value="0x07" >
       <value value="default" name="invalid" />
       <value value="0x02" name="HS"        cname="_OSC_HS"    />
       <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC"    />
       <value value="0x05" name="EC_IO"     cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"        cname="_OSC_HSPLL" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -85,106 +85,106 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2550.xml b/src/devices/pic/xml_data/18F2550.xml
index 21ab9ae..af87dd0 100644
--- a/src/devices/pic/xml_data/18F2550.xml
+++ b/src/devices/pic/xml_data/18F2550.xml
@@ -26,15 +26,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
       <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
       <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
       <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          sdcc_cname="_OSC_HS__USB_HS" />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
       <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
       <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
       <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -130,131 +130,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  sdcc_cname="_ENHCPU_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F258.xml b/src/devices/pic/xml_data/18F258.xml
index bb27ca5..c24567e 100644
--- a/src/devices/pic/xml_data/18F258.xml
+++ b/src/devices/pic/xml_data/18F258.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -92,118 +92,118 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2580.xml b/src/devices/pic/xml_data/18F2580.xml
index 6721af5..4458519 100644
--- a/src/devices/pic/xml_data/18F2580.xml
+++ b/src/devices/pic/xml_data/18F2580.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"        />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE"   />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"       />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,139 +106,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x10" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x10" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2585.xml b/src/devices/pic/xml_data/18F2585.xml
index 12b38f1..fa6d739 100644
--- a/src/devices/pic/xml_data/18F2585.xml
+++ b/src/devices/pic/xml_data/18F2585.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,129 +106,129 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F25J10.xml b/src/devices/pic/xml_data/18F25J10.xml
index 57f37d4..e6b94e0 100644
--- a/src/devices/pic/xml_data/18F25J10.xml
+++ b/src/devices/pic/xml_data/18F25J10.xml
@@ -31,55 +31,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -96,23 +96,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2610.xml b/src/devices/pic/xml_data/18F2610.xml
index e38c6d2..3de5893 100644
--- a/src/devices/pic/xml_data/18F2610.xml
+++ b/src/devices/pic/xml_data/18F2610.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,131 +105,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2620.xml b/src/devices/pic/xml_data/18F2620.xml
index 7c25f21..faacae3 100644
--- a/src/devices/pic/xml_data/18F2620.xml
+++ b/src/devices/pic/xml_data/18F2620.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -51,42 +51,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO6"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BORV_46" />
       <value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BORV_43" />
       <value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BORV_28" />
       <value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BORV_21" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -103,131 +103,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2680.xml b/src/devices/pic/xml_data/18F2680.xml
index 2dcd013..09c4863 100644
--- a/src/devices/pic/xml_data/18F2680.xml
+++ b/src/devices/pic/xml_data/18F2680.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,141 +106,141 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2682.xml b/src/devices/pic/xml_data/18F2682.xml
index 8c13b2d..9f5501f 100644
--- a/src/devices/pic/xml_data/18F2682.xml
+++ b/src/devices/pic/xml_data/18F2682.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,153 +100,153 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2685.xml b/src/devices/pic/xml_data/18F2685.xml
index bca6818..cba2b20 100644
--- a/src/devices/pic/xml_data/18F2685.xml
+++ b/src/devices/pic/xml_data/18F2685.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,165 +100,165 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4220.xml b/src/devices/pic/xml_data/18F4220.xml
index f1c19c7..12dda87 100644
--- a/src/devices/pic/xml_data/18F4220.xml
+++ b/src/devices/pic/xml_data/18F4220.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -57,40 +57,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
       <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -107,107 +107,107 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_B3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_C1" />
-    </mask>
-    <mask name="PBADEN" value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN" value="0x02" >
       <value value="0x00" name="digital" cname="_PBAD_DIG" />
       <value value="0x02" name="analog"  cname="_PBAD_ANA" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4221.xml b/src/devices/pic/xml_data/18F4221.xml
index d4a7e11..417ae32 100644
--- a/src/devices/pic/xml_data/18F4221.xml
+++ b/src/devices/pic/xml_data/18F4221.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"   />
       <value value="0x02" name="Software" cname="_BOR_SOFT"  />
       <value value="0x04" name="On_run"   cname="_BOR_NOSLP" />
       <value value="0x06" name="On"       cname="_BOR_ON"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,125 +106,125 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_DIG" />
       <value value="0x02" name="analog"  cname="_PBADEN_ANA" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="ICPORT" value="0x08" >
+    </tqmask>
+    <tqmask name="ICPORT" value="0x08" >
       <value value="0x00" name="Off" cname="_ICPORT_OFF" />
       <value value="0x08" name="On"  cname="_ICPORT_ON" />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="256" cname="_BBSIZ_BB256" />
       <value value="0x10" name="512" cname="_BBSIZ_BB512" />
       <value value="0x20" name="512" cname="_BBSIZ_BB512" />
       <value value="0x30" name="512" cname="_BBSIZ_BB512" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4320.xml b/src/devices/pic/xml_data/18F4320.xml
index 734bb11..141b008 100644
--- a/src/devices/pic/xml_data/18F4320.xml
+++ b/src/devices/pic/xml_data/18F4320.xml
@@ -37,17 +37,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -59,40 +59,40 @@
       <value value="0x08" name="INTRC_IO"     cname="_INTIO2_OSC" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
       <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -109,131 +109,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_B3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_C1" />
-    </mask>
-    <mask name="PBADEN" value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN" value="0x02" >
       <value value="0x00" name="digital" cname="_PBAD_DIG" />
       <value value="0x02" name="analog"  cname="_PBAD_ANA" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_WRT2_ON"  />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_WRT3_ON"  />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:07FF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="1000:17FF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="1800:1FFF" cname="_EBTR3_ON"  />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4321.xml b/src/devices/pic/xml_data/18F4321.xml
index 6bdd265..a7f5bd9 100644
--- a/src/devices/pic/xml_data/18F4321.xml
+++ b/src/devices/pic/xml_data/18F4321.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"   />
       <value value="0x02" name="Software" cname="_BOR_SOFT"  />
       <value value="0x04" name="On_run"   cname="_BOR_NOSLP" />
       <value value="0x06" name="On"       cname="_BOR_ON"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,125 +106,125 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CPP2MX_RB3" />
       <value value="0x01" name="RC1" cname="_CPP2MX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_DIG" />
       <value value="0x02" name="analog"  cname="_PBADEN_ANA" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="ICPORT" value="0x08" >
+    </tqmask>
+    <tqmask name="ICPORT" value="0x08" >
       <value value="0x00" name="Off" cname="_ICPORT_OFF" />
       <value value="0x08" name="On"  cname="_ICPORT_ON" />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="256"  cname="_BBSIZ_BB256" />
       <value value="0x10" name="512"  cname="_BBSIZ_BB512" />
       <value value="0x20" name="1024" cname="_BBSIZ_BB512" />
       <value value="0x30" name="1024" cname="_BBSIZ_BB512" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4331.xml b/src/devices/pic/xml_data/18F4331.xml
index a22e667..7709516 100644
--- a/src/devices/pic/xml_data/18F4331.xml
+++ b/src/devices/pic/xml_data/18F4331.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -61,40 +61,40 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRTEN_ON"  />
       <value value="0x01" name="Off" cname="_PWRTEN_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOREN_OFF" />
       <value value="0x02" name="On"  cname="_BOREN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDTEN_OFF" />
       <value value="0x01" name="On"  cname="_WDTEN_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDPS_4"     />
@@ -111,136 +111,136 @@
       <value value="0x1A" name="1:8192"  cname="_WDPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDPS_32768" />
-    </mask>
-    <mask name="WINEN" value="0x20" >
+    </tqmask>
+    <tqmask name="WINEN" value="0x20" >
       <value value="0x00" name="On"  cname="_WINEN_ON"  />
       <value value="0x20" name="Off" cname="_WINEN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
-    <mask name="PWMPIN"  value="0x04" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+    <tqmask name="PWMPIN"  value="0x04" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x04" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"    value="0x08" >
+    </tqmask>
+    <tqmask name="LPOL"    value="0x08" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x08" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"    value="0x10" >
+    </tqmask>
+    <tqmask name="HPOL"    value="0x10" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x10" name="high" cname="_HPOL_HIGH" />
-    </mask>
-    <mask name="T1OSCMX" value="0x20" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x20" >
       <value value="0x00" name="Legacy"    cname="_T1OSCMX_OFF" />
       <value value="0x20" name="Low Power" cname="_T1OSCMX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
-    <mask name="FLTAMX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+    <tqmask name="FLTAMX" value="0x01" >
       <value value="0x00" name="RD4" cname="_FLTAMX_RD4" />
       <value value="0x01" name="RC1" cname="_FLTAMX_RC1"  />
-    </mask>
-    <mask name="SSPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="SSPMX" value="0x04" >
       <value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" />
       <value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7"  />
-    </mask>
-    <mask name="PWM4MX" value="0x08" >
+    </tqmask>
+    <tqmask name="PWM4MX" value="0x08" >
       <value value="0x00" name="RD5" cname="_PWM4MX_RD5" />
       <value value="0x08" name="RB5" cname="_PWM4MX_RB5"  />
-    </mask>
-    <mask name="EXCLKMX" value="0x10" >
+    </tqmask>
+    <tqmask name="EXCLKMX" value="0x10" >
       <value value="0x00" name="RD0" cname="_EXCLKMX_RD0" />
       <value value="0x10" name="RC3" cname="_EXCLKMX_RC3"  />
-    </mask>
-    <mask name="MCLRE" value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4410.xml b/src/devices/pic/xml_data/18F4410.xml
index 8ca9b17..42557f8 100644
--- a/src/devices/pic/xml_data/18F4410.xml
+++ b/src/devices/pic/xml_data/18F4410.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,107 +105,107 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F442.xml b/src/devices/pic/xml_data/18F442.xml
index 61f6a63..1a864f5 100644
--- a/src/devices/pic/xml_data/18F442.xml
+++ b/src/devices/pic/xml_data/18F442.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -91,99 +91,99 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1"/>
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4420.xml b/src/devices/pic/xml_data/18F4420.xml
index 83a0022..19e9c62 100644
--- a/src/devices/pic/xml_data/18F4420.xml
+++ b/src/devices/pic/xml_data/18F4420.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,115 +106,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4423.xml b/src/devices/pic/xml_data/18F4423.xml
index 1760494..540c8e4 100644
--- a/src/devices/pic/xml_data/18F4423.xml
+++ b/src/devices/pic/xml_data/18F4423.xml
@@ -24,17 +24,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -45,42 +45,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -97,115 +97,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
   
   <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4431.xml b/src/devices/pic/xml_data/18F4431.xml
index c19b48a..dc8edc0 100644
--- a/src/devices/pic/xml_data/18F4431.xml
+++ b/src/devices/pic/xml_data/18F4431.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -62,40 +62,40 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRTEN_ON"  />
       <value value="0x01" name="Off" cname="_PWRTEN_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOREN_OFF" />
       <value value="0x02" name="On"  cname="_BOREN_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDTEN_OFF" />
       <value value="0x01" name="On"  cname="_WDTEN_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDPS_4"     />
@@ -112,160 +112,160 @@
       <value value="0x1A" name="1:8192"  cname="_WDPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDPS_32768" />
-    </mask>
-    <mask name="WINEN" value="0x20" >
+    </tqmask>
+    <tqmask name="WINEN" value="0x20" >
       <value value="0x00" name="On"  cname="_WINEN_ON"  />
       <value value="0x20" name="Off" cname="_WINEN_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
-    <mask name="PWMPIN"  value="0x04" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+    <tqmask name="PWMPIN"  value="0x04" >
       <value value="0x00" name="On"  cname="_PWMPIN_ON"  />
       <value value="0x04" name="Off" cname="_PWMPIN_OFF" />
-    </mask>
-    <mask name="LPOL"    value="0x08" >
+    </tqmask>
+    <tqmask name="LPOL"    value="0x08" >
       <value value="0x00" name="low"  cname="_LPOL_LOW"  />
       <value value="0x08" name="high" cname="_LPOL_HIGH" />
-    </mask>
-    <mask name="HPOL"    value="0x10" >
+    </tqmask>
+    <tqmask name="HPOL"    value="0x10" >
       <value value="0x00" name="low"  cname="_HPOL_LOW"  />
       <value value="0x10" name="high" cname="_HPOL_HIGH" />
-    </mask>
-    <mask name="T1OSCMX" value="0x20" >
+    </tqmask>
+    <tqmask name="T1OSCMX" value="0x20" >
       <value value="0x00" name="Legacy"    cname="_T1OSCMX_OFF" />
       <value value="0x20" name="Low Power" cname="_T1OSCMX_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
-    <mask name="FLTAMX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+    <tqmask name="FLTAMX" value="0x01" >
       <value value="0x00" name="RD4" cname="_FLTAMX_RD4" />
       <value value="0x01" name="RC1" cname="_FLTAMX_RC1"  />
-    </mask>
-    <mask name="SSPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="SSPMX" value="0x04" >
       <value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" />
       <value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7"  />
-    </mask>
-    <mask name="PWM4MX" value="0x08" >
+    </tqmask>
+    <tqmask name="PWM4MX" value="0x08" >
       <value value="0x00" name="RD5" cname="_PWM4MX_RD5" />
       <value value="0x08" name="RB5" cname="_PWM4MX_RB5"  />
-    </mask>
-    <mask name="EXCLKMX" value="0x10" >
+    </tqmask>
+    <tqmask name="EXCLKMX" value="0x10" >
       <value value="0x00" name="RD0" cname="_EXCLKMX_RD0" />
       <value value="0x10" name="RC3" cname="_EXCLKMX_RC3"  />
-    </mask>
-    <mask name="MCLRE" value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="2000:2FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="3000:3FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4439.xml b/src/devices/pic/xml_data/18F4439.xml
index 3441809..9104408 100644
--- a/src/devices/pic/xml_data/18F4439.xml
+++ b/src/devices/pic/xml_data/18F4439.xml
@@ -35,48 +35,48 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC" value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC" value="0x07" >
       <value value="default" name="invalid" />
       <value value="0x02" name="HS"        cname="_OSC_HS"    />
       <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC"    />
       <value value="0x05" name="EC_IO"     cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"        cname="_OSC_HSPLL" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -85,94 +85,94 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4450.xml b/src/devices/pic/xml_data/18F4450.xml
index e634df1..208518e 100644
--- a/src/devices/pic/xml_data/18F4450.xml
+++ b/src/devices/pic/xml_data/18F4450.xml
@@ -27,14 +27,14 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  />
       <value value="0x06" name="10" cname="_PLLDIV_10" />
       <value value="0x07" name="12" cname="_PLLDIV_12" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" />
       <value value="0x20" name="2" cname="_USBDIV_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.6" cname="_BORV_46" />
       <value value="0x08" name="4.3" cname="_BORV_43" />
       <value value="0x10" name="2.8" cname="_BORV_28" />
       <value value="0x18" name="2.1" cname="_BORV_21" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -130,111 +130,111 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x28" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x28" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x08" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x08" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x08" name="2048" cname="_BBSIZ_2048" />
-    </mask>
-    <mask name="ICPORT" value="0x20" >
+    </tqmask>
+    <tqmask name="ICPORT" value="0x20" >
       <value value="0x00" name="On"  cname="_ICPORT_ON" />
       <value value="0x20" name="Off" cname="_ICPORT_OFF" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4455.xml b/src/devices/pic/xml_data/18F4455.xml
index 282decb..6a77cfb 100644
--- a/src/devices/pic/xml_data/18F4455.xml
+++ b/src/devices/pic/xml_data/18F4455.xml
@@ -26,15 +26,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
       <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
       <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
       <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          sdcc_cname="_OSC_HS__USB_HS" />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
       <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
       <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
       <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -130,131 +130,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="ICPORT" value="0x20" >
+    </tqmask>
+    <tqmask name="ICPORT" value="0x20" >
       <value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" />
       <value value="0x20" name="On"  cname="_ICPRT_ON"  sdcc_cname="_ENICPORT_ON" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  sdcc_cname="_ENHCPU_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F448.xml b/src/devices/pic/xml_data/18F448.xml
index 40de124..137b34a 100644
--- a/src/devices/pic/xml_data/18F448.xml
+++ b/src/devices/pic/xml_data/18F448.xml
@@ -34,17 +34,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -91,94 +91,94 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4480.xml b/src/devices/pic/xml_data/18F4480.xml
index b9a87da..14b60cb 100644
--- a/src/devices/pic/xml_data/18F4480.xml
+++ b/src/devices/pic/xml_data/18F4480.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,115 +106,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x10" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x10" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F44J10.xml b/src/devices/pic/xml_data/18F44J10.xml
index ddf2019..c9ce5b8 100644
--- a/src/devices/pic/xml_data/18F44J10.xml
+++ b/src/devices/pic/xml_data/18F44J10.xml
@@ -31,55 +31,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -96,23 +96,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4510.xml b/src/devices/pic/xml_data/18F4510.xml
index b038b39..bcfec9c 100644
--- a/src/devices/pic/xml_data/18F4510.xml
+++ b/src/devices/pic/xml_data/18F4510.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,131 +105,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4515.xml b/src/devices/pic/xml_data/18F4515.xml
index 4325432..671198c 100644
--- a/src/devices/pic/xml_data/18F4515.xml
+++ b/src/devices/pic/xml_data/18F4515.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,119 +105,119 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F452.xml b/src/devices/pic/xml_data/18F452.xml
index 12ad5ce..24d1e3d 100644
--- a/src/devices/pic/xml_data/18F452.xml
+++ b/src/devices/pic/xml_data/18F452.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -92,123 +92,123 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4520.xml b/src/devices/pic/xml_data/18F4520.xml
index a1a1e75..4699c01 100644
--- a/src/devices/pic/xml_data/18F4520.xml
+++ b/src/devices/pic/xml_data/18F4520.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,139 +106,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4523.xml b/src/devices/pic/xml_data/18F4523.xml
index 29b2583..26db550 100644
--- a/src/devices/pic/xml_data/18F4523.xml
+++ b/src/devices/pic/xml_data/18F4523.xml
@@ -24,17 +24,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -51,42 +51,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -103,139 +103,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTB" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4525.xml b/src/devices/pic/xml_data/18F4525.xml
index f37d90b..0928756 100644
--- a/src/devices/pic/xml_data/18F4525.xml
+++ b/src/devices/pic/xml_data/18F4525.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,127 +106,127 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4539.xml b/src/devices/pic/xml_data/18F4539.xml
index 71a1f4c..2733301 100644
--- a/src/devices/pic/xml_data/18F4539.xml
+++ b/src/devices/pic/xml_data/18F4539.xml
@@ -35,48 +35,48 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC" value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC" value="0x07" >
       <value value="default" name="invalid" />
       <value value="0x02" name="HS"        cname="_OSC_HS"    />
       <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC"    />
       <value value="0x05" name="EC_IO"     cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"        cname="_OSC_HSPLL" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -85,106 +85,106 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4550.xml b/src/devices/pic/xml_data/18F4550.xml
index b0e26c8..d988438 100644
--- a/src/devices/pic/xml_data/18F4550.xml
+++ b/src/devices/pic/xml_data/18F4550.xml
@@ -26,15 +26,15 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
-    <mask name="PLLDIV" value="0x07" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+    <tqmask name="PLLDIV" value="0x07" >
       <value value="0x00" name="1"  cname="_PLLDIV_1"  sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
       <value value="0x01" name="2"  cname="_PLLDIV_2"  sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
       <value value="0x02" name="3"  cname="_PLLDIV_3"  sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
       <value value="0x05" name="6"  cname="_PLLDIV_6"  sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
       <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
       <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
-    </mask>
-    <mask name="CPUDIV" value="0x18" >
+    </tqmask>
+    <tqmask name="CPUDIV" value="0x18" >
       <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
       <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
       <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
       <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
-    </mask>
-    <mask name="USBDIV" value="0x20" >
+    </tqmask>
+    <tqmask name="USBDIV" value="0x20" >
       <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
       <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x01" name="XT"           cname="_FOSC_XT_XT"       sdcc_cname="_OSC_XT__USB_XT" />
       <value value="0x02" name="XTPLL"        cname="_FOSC_XTPLL"       sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
       <value value="0x0D" name="HS"           cname="_FOSC_HS"          sdcc_cname="_OSC_HS__USB_HS" />
       <value value="0x0E" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
       <value value="0x0F" name="HSPLL"        cname="_FOSC_HSPLL_HS"    sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEM_ON"  sdcc_cname="_FCMEN_ON" />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE"  value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE"  value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN"  value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x06" >
       <value value="0x00" name="Off"      cname="_BOR_OFF"       sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="Software" cname="_BOR_SOFT"      sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
       <value value="0x04" name="On_run"   cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOR_ON"        sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"   value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
       <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
       <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
       <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
-    </mask>
-    <mask name="VREGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="VREGEN" value="0x20" >
       <value value="0x00" name="Off" cname="_VREGEN_OFF" />
       <value value="0x20" name="On"  cname="_VREGEN_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  sdcc_cname="_WDT_ON" />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -130,135 +130,135 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="ICPORT" value="0x20" >
+    </tqmask>
+    <tqmask name="ICPORT" value="0x20" >
       <value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" />
       <value value="0x20" name="On"  cname="_ICPRT_ON"  sdcc_cname="_ENICPORT_ON" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  sdcc_cname="_ENHCPU_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F458.xml b/src/devices/pic/xml_data/18F458.xml
index 33069dd..758acc8 100644
--- a/src/devices/pic/xml_data/18F458.xml
+++ b/src/devices/pic/xml_data/18F458.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON"  />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -92,118 +92,118 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4580.xml b/src/devices/pic/xml_data/18F4580.xml
index e6e105a..cd1e077 100644
--- a/src/devices/pic/xml_data/18F4580.xml
+++ b/src/devices/pic/xml_data/18F4580.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,139 +106,139 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x10" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x10" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"            cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"            cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"            cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4585.xml b/src/devices/pic/xml_data/18F4585.xml
index fb438b8..dca0022 100644
--- a/src/devices/pic/xml_data/18F4585.xml
+++ b/src/devices/pic/xml_data/18F4585.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,129 +106,129 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F45J10.xml b/src/devices/pic/xml_data/18F45J10.xml
index af2c752..aede454 100644
--- a/src/devices/pic/xml_data/18F45J10.xml
+++ b/src/devices/pic/xml_data/18F45J10.xml
@@ -31,55 +31,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -96,23 +96,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4610.xml b/src/devices/pic/xml_data/18F4610.xml
index d105cdb..9c3fe13 100644
--- a/src/devices/pic/xml_data/18F4610.xml
+++ b/src/devices/pic/xml_data/18F4610.xml
@@ -27,16 +27,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -53,42 +53,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"      />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     />
       <value value="0x02" name="Software" cname="_BOREN_ON"      />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -105,131 +105,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4620.xml b/src/devices/pic/xml_data/18F4620.xml
index 5964590..ff74392 100644
--- a/src/devices/pic/xml_data/18F4620.xml
+++ b/src/devices/pic/xml_data/18F4620.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"      />
       <value value="0x01" name="XT"           cname="_OSC_XT"      />
       <value value="0x02" name="HS"           cname="_OSC_HS"      />
@@ -51,42 +51,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO6"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7"  />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"     sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON"      sdcc_cname="_BODEN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP"   sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
       <value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
       <value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
       <value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     sdcc_cname="_WDTPS_1_4" />
@@ -103,131 +103,131 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  sdcc_cname="_WDTPS_1_8192" />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
-    <mask name="PBADEN"  value="0x02" >
+    </tqmask>
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON"  sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  sdcc_cname="_STVR_ON" />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4680.xml b/src/devices/pic/xml_data/18F4680.xml
index f5ef137..155abb9 100644
--- a/src/devices/pic/xml_data/18F4680.xml
+++ b/src/devices/pic/xml_data/18F4680.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -106,141 +106,141 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4682.xml b/src/devices/pic/xml_data/18F4682.xml
index 19b387b..c6ce618 100644
--- a/src/devices/pic/xml_data/18F4682.xml
+++ b/src/devices/pic/xml_data/18F4682.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,153 +100,153 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4685.xml b/src/devices/pic/xml_data/18F4685.xml
index 7b68ee2..1e73ffd 100644
--- a/src/devices/pic/xml_data/18F4685.xml
+++ b/src/devices/pic/xml_data/18F4685.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"   />
       <value value="0x08" name="INTRC_IO"     cname="_OSC_IRCIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF"   />
       <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL"  />
       <value value="0x04" name="On_run"   cname="_BOREN_BOACTIVE" />
       <value value="0x06" name="On"       cname="_BOREN_BOHW"    />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"     />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"     />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"     />
@@ -100,165 +100,165 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
-    <mask name="PBADEN"  value="0x02" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+    <tqmask name="PBADEN"  value="0x02" >
       <value value="0x00" name="digital" cname="_PBADEN_OFF" />
       <value value="0x02" name="analog"  cname="_PBADEN_ON" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON"  />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON"  />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6310.xml b/src/devices/pic/xml_data/18F6310.xml
index 9bdbfb7..f975990 100644
--- a/src/devices/pic/xml_data/18F6310.xml
+++ b/src/devices/pic/xml_data/18F6310.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6390.xml b/src/devices/pic/xml_data/18F6390.xml
index 02f2498..ec6b10c 100644
--- a/src/devices/pic/xml_data/18F6390.xml
+++ b/src/devices/pic/xml_data/18F6390.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6393.xml b/src/devices/pic/xml_data/18F6393.xml
index bc778f4..bb48cbe 100644
--- a/src/devices/pic/xml_data/18F6393.xml
+++ b/src/devices/pic/xml_data/18F6393.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"         start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -56,42 +56,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -108,79 +108,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F63J11.xml b/src/devices/pic/xml_data/18F63J11.xml
index 37273bc..481e5e8 100644
--- a/src/devices/pic/xml_data/18F63J11.xml
+++ b/src/devices/pic/xml_data/18F63J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F63J90.xml b/src/devices/pic/xml_data/18F63J90.xml
index ef1310c..48f5c8e 100644
--- a/src/devices/pic/xml_data/18F63J90.xml
+++ b/src/devices/pic/xml_data/18F63J90.xml
@@ -28,55 +28,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -93,23 +93,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6410.xml b/src/devices/pic/xml_data/18F6410.xml
index c270208..670937b 100644
--- a/src/devices/pic/xml_data/18F6410.xml
+++ b/src/devices/pic/xml_data/18F6410.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6490.xml b/src/devices/pic/xml_data/18F6490.xml
index 1727686..bd4ae20 100644
--- a/src/devices/pic/xml_data/18F6490.xml
+++ b/src/devices/pic/xml_data/18F6490.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6493.xml b/src/devices/pic/xml_data/18F6493.xml
index 89f409d..f980eca 100644
--- a/src/devices/pic/xml_data/18F6493.xml
+++ b/src/devices/pic/xml_data/18F6493.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"         start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -56,42 +56,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -108,79 +108,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F64J11.xml b/src/devices/pic/xml_data/18F64J11.xml
index fd126a0..d3e9696 100644
--- a/src/devices/pic/xml_data/18F64J11.xml
+++ b/src/devices/pic/xml_data/18F64J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F64J90.xml b/src/devices/pic/xml_data/18F64J90.xml
index fedf592..70df11f 100644
--- a/src/devices/pic/xml_data/18F64J90.xml
+++ b/src/devices/pic/xml_data/18F64J90.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6520.xml b/src/devices/pic/xml_data/18F6520.xml
index a022295..20eac42 100644
--- a/src/devices/pic/xml_data/18F6520.xml
+++ b/src/devices/pic/xml_data/18F6520.xml
@@ -36,17 +36,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -55,36 +55,36 @@
       <value value="0x05" name="EC_IO"        cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"           cname="_OSC_HSPLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -93,123 +93,123 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MUX_RE7" />
       <value value="0x01" name="RC1" cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6525.xml b/src/devices/pic/xml_data/18F6525.xml
index 953e12a..c3206cb 100644
--- a/src/devices/pic/xml_data/18F6525.xml
+++ b/src/devices/pic/xml_data/18F6525.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -59,36 +59,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,115 +105,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6527.xml b/src/devices/pic/xml_data/18F6527.xml
index 04a2bf1..8779fa8 100644
--- a/src/devices/pic/xml_data/18F6527.xml
+++ b/src/devices/pic/xml_data/18F6527.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -106,129 +106,129 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_1024" />
       <value value="0x10" name="2048" cname="_BBSIZ_2048" />
       <value value="0x20" name="4096" cname="_BBSIZ_4096" />
       <value value="0x30" name="4096" cname="_BBSIZ_4096" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6585.xml b/src/devices/pic/xml_data/18F6585.xml
index 0bf9bab..d602f95 100644
--- a/src/devices/pic/xml_data/18F6585.xml
+++ b/src/devices/pic/xml_data/18F6585.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -51,36 +51,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -97,115 +97,115 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" cmask="0x02" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" ctqmask="0x02" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J10.xml b/src/devices/pic/xml_data/18F65J10.xml
index a67fe87..473c590 100644
--- a/src/devices/pic/xml_data/18F65J10.xml
+++ b/src/devices/pic/xml_data/18F65J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J11.xml b/src/devices/pic/xml_data/18F65J11.xml
index 2ef5b3d..c4284fc 100644
--- a/src/devices/pic/xml_data/18F65J11.xml
+++ b/src/devices/pic/xml_data/18F65J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J15.xml b/src/devices/pic/xml_data/18F65J15.xml
index f5f310a..6c212d2 100644
--- a/src/devices/pic/xml_data/18F65J15.xml
+++ b/src/devices/pic/xml_data/18F65J15.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J50.xml b/src/devices/pic/xml_data/18F65J50.xml
index d0cdd2b..ad5bc75 100644
--- a/src/devices/pic/xml_data/18F65J50.xml
+++ b/src/devices/pic/xml_data/18F65J50.xml
@@ -29,12 +29,12 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -43,51 +43,51 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,27 +104,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J90.xml b/src/devices/pic/xml_data/18F65J90.xml
index 91997da..34e7be9 100644
--- a/src/devices/pic/xml_data/18F65J90.xml
+++ b/src/devices/pic/xml_data/18F65J90.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6620.xml b/src/devices/pic/xml_data/18F6620.xml
index e88ee06..8159b62 100644
--- a/src/devices/pic/xml_data/18F6620.xml
+++ b/src/devices/pic/xml_data/18F6620.xml
@@ -38,17 +38,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -57,36 +57,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -95,123 +95,123 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6621.xml b/src/devices/pic/xml_data/18F6621.xml
index 664de3f..e043ddf 100644
--- a/src/devices/pic/xml_data/18F6621.xml
+++ b/src/devices/pic/xml_data/18F6621.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -59,36 +59,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,127 +105,127 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6622.xml b/src/devices/pic/xml_data/18F6622.xml
index 6fb81d7..b8e0bb7 100644
--- a/src/devices/pic/xml_data/18F6622.xml
+++ b/src/devices/pic/xml_data/18F6622.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -54,42 +54,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -106,141 +106,141 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6627.xml b/src/devices/pic/xml_data/18F6627.xml
index 74248c6..1b0bbc8 100644
--- a/src/devices/pic/xml_data/18F6627.xml
+++ b/src/devices/pic/xml_data/18F6627.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -100,165 +100,165 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6680.xml b/src/devices/pic/xml_data/18F6680.xml
index d0a9922..6780e23 100644
--- a/src/devices/pic/xml_data/18F6680.xml
+++ b/src/devices/pic/xml_data/18F6680.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF"  word_write_align="4" word_erase_align="32"/>
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -51,36 +51,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -97,127 +97,127 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J10.xml b/src/devices/pic/xml_data/18F66J10.xml
index 7bb9aa7..6df51e5 100644
--- a/src/devices/pic/xml_data/18F66J10.xml
+++ b/src/devices/pic/xml_data/18F66J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J11.xml b/src/devices/pic/xml_data/18F66J11.xml
index 8fd1314..11d7f05 100644
--- a/src/devices/pic/xml_data/18F66J11.xml
+++ b/src/devices/pic/xml_data/18F66J11.xml
@@ -30,55 +30,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -95,27 +95,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname="" />
       <value value="0x01" name="RC1"  cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J15.xml b/src/devices/pic/xml_data/18F66J15.xml
index c1c5c95..651b2d4 100644
--- a/src/devices/pic/xml_data/18F66J15.xml
+++ b/src/devices/pic/xml_data/18F66J15.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J16.xml b/src/devices/pic/xml_data/18F66J16.xml
index cf84f44..8a15ffd 100644
--- a/src/devices/pic/xml_data/18F66J16.xml
+++ b/src/devices/pic/xml_data/18F66J16.xml
@@ -29,55 +29,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,27 +94,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname="" />
       <value value="0x01" name="RC1"  cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J50.xml b/src/devices/pic/xml_data/18F66J50.xml
index 34dbe21..4d60faa 100644
--- a/src/devices/pic/xml_data/18F66J50.xml
+++ b/src/devices/pic/xml_data/18F66J50.xml
@@ -29,12 +29,12 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -43,51 +43,51 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,27 +104,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J55.xml b/src/devices/pic/xml_data/18F66J55.xml
index 7e95978..d97b54a 100644
--- a/src/devices/pic/xml_data/18F66J55.xml
+++ b/src/devices/pic/xml_data/18F66J55.xml
@@ -29,12 +29,12 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -43,51 +43,51 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,27 +104,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J60.xml b/src/devices/pic/xml_data/18F66J60.xml
index e4ac5ea..430812c 100644
--- a/src/devices/pic/xml_data/18F66J60.xml
+++ b/src/devices/pic/xml_data/18F66J60.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J65.xml b/src/devices/pic/xml_data/18F66J65.xml
index 8431ec8..3a54046 100644
--- a/src/devices/pic/xml_data/18F66J65.xml
+++ b/src/devices/pic/xml_data/18F66J65.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6720.xml b/src/devices/pic/xml_data/18F6720.xml
index c023b5e..a609ee9 100644
--- a/src/devices/pic/xml_data/18F6720.xml
+++ b/src/devices/pic/xml_data/18F6720.xml
@@ -35,17 +35,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -54,36 +54,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -92,171 +92,171 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
-    <mask name="CP_6" value="0x40" >
+    </tqmask>
+    <tqmask name="CP_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
       <value value="0x40" name="Off"         cname="_CP6_OFF" />
-    </mask>
-    <mask name="CP_7" value="0x80" >
+    </tqmask>
+    <tqmask name="CP_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
       <value value="0x80" name="Off"         cname="_CP7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
-    <mask name="WRT_6" value="0x40" >
+    </tqmask>
+    <tqmask name="WRT_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
       <value value="0x40" name="Off"         cname="_WRT6_OFF" />
-    </mask>
-    <mask name="WRT_7" value="0x80" >
+    </tqmask>
+    <tqmask name="WRT_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
       <value value="0x80" name="Off"         cname="_WRT7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
-    <mask name="EBTR_6" value="0x40" >
+    </tqmask>
+    <tqmask name="EBTR_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
       <value value="0x40" name="Off"         cname="_EBTR6_OFF" />
-    </mask>
-    <mask name="EBTR_7" value="0x80" >
+    </tqmask>
+    <tqmask name="EBTR_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
       <value value="0x80" name="Off"         cname="_EBTR7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6722.xml b/src/devices/pic/xml_data/18F6722.xml
index fb30985..6a3c8ad 100644
--- a/src/devices/pic/xml_data/18F6722.xml
+++ b/src/devices/pic/xml_data/18F6722.xml
@@ -27,17 +27,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -48,42 +48,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-   </mask>
-    <mask name="FCMEN" value="0x40" >
+   </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -100,189 +100,189 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
-    <mask name="CP_6" value="0x40" >
+    </tqmask>
+    <tqmask name="CP_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
       <value value="0x40" name="Off"         cname="_CP6_OFF" />
-    </mask>
-    <mask name="CP_7" value="0x80" >
+    </tqmask>
+    <tqmask name="CP_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
       <value value="0x80" name="Off"         cname="_CP7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
-    <mask name="WRT_6" value="0x40" >
+    </tqmask>
+    <tqmask name="WRT_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
       <value value="0x40" name="Off"         cname="_WRT6_OFF" />
-    </mask>
-    <mask name="WRT_7" value="0x80" >
+    </tqmask>
+    <tqmask name="WRT_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
       <value value="0x80" name="Off"         cname="_WRT7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
-    <mask name="EBTR_6" value="0x40" >
+    </tqmask>
+    <tqmask name="EBTR_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
       <value value="0x40" name="Off"         cname="_EBTR6_OFF" />
-    </mask>
-    <mask name="EBTR_7" value="0x80" >
+    </tqmask>
+    <tqmask name="EBTR_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
       <value value="0x80" name="Off"         cname="_EBTR7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J10.xml b/src/devices/pic/xml_data/18F67J10.xml
index 78223c3..4c6f875 100644
--- a/src/devices/pic/xml_data/18F67J10.xml
+++ b/src/devices/pic/xml_data/18F67J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J11.xml b/src/devices/pic/xml_data/18F67J11.xml
index d13e7dc..3f12d71 100644
--- a/src/devices/pic/xml_data/18F67J11.xml
+++ b/src/devices/pic/xml_data/18F67J11.xml
@@ -30,55 +30,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -95,27 +95,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname="" />
       <value value="0x01" name="RC1"  cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J50.xml b/src/devices/pic/xml_data/18F67J50.xml
index 91eade3..d704f33 100644
--- a/src/devices/pic/xml_data/18F67J50.xml
+++ b/src/devices/pic/xml_data/18F67J50.xml
@@ -29,12 +29,12 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -43,51 +43,51 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,27 +104,27 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J60.xml b/src/devices/pic/xml_data/18F67J60.xml
index 29922db..a5bfdcf 100644
--- a/src/devices/pic/xml_data/18F67J60.xml
+++ b/src/devices/pic/xml_data/18F67J60.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,23 +94,23 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8310.xml b/src/devices/pic/xml_data/18F8310.xml
index 1fe084d..5a16736 100644
--- a/src/devices/pic/xml_data/18F8310.xml
+++ b/src/devices/pic/xml_data/18F8310.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8390.xml b/src/devices/pic/xml_data/18F8390.xml
index 4dbff0c..182acf1 100644
--- a/src/devices/pic/xml_data/18F8390.xml
+++ b/src/devices/pic/xml_data/18F8390.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,79 +105,79 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_PM_MP" />
       <value value="0x03" name="Microcontroller"          cname="_PM_MC" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_BW_8" />
       <value value="0x40" name="16" cname="_BW_16" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8393.xml b/src/devices/pic/xml_data/18F8393.xml
index ce846db..bd27973 100644
--- a/src/devices/pic/xml_data/18F8393.xml
+++ b/src/devices/pic/xml_data/18F8393.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"         start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -56,42 +56,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -108,64 +108,64 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F83J11.xml b/src/devices/pic/xml_data/18F83J11.xml
index 4a9d249..6fbfbc0 100644
--- a/src/devices/pic/xml_data/18F83J11.xml
+++ b/src/devices/pic/xml_data/18F83J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F83J90.xml b/src/devices/pic/xml_data/18F83J90.xml
index 8e10c27..c8fc70e 100644
--- a/src/devices/pic/xml_data/18F83J90.xml
+++ b/src/devices/pic/xml_data/18F83J90.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8410.xml b/src/devices/pic/xml_data/18F8410.xml
index b5c49cd..46d46a3 100644
--- a/src/devices/pic/xml_data/18F8410.xml
+++ b/src/devices/pic/xml_data/18F8410.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,64 +105,64 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8490.xml b/src/devices/pic/xml_data/18F8490.xml
index 3871a60..0f2e987 100644
--- a/src/devices/pic/xml_data/18F8490.xml
+++ b/src/devices/pic/xml_data/18F8490.xml
@@ -33,16 +33,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -53,42 +53,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -105,64 +105,64 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8493.xml b/src/devices/pic/xml_data/18F8493.xml
index 4e8bc52..4d61277 100644
--- a/src/devices/pic/xml_data/18F8493.xml
+++ b/src/devices/pic/xml_data/18F8493.xml
@@ -36,16 +36,16 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F" />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F" />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -56,42 +56,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -108,64 +108,64 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1"     cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
-    <mask name="CP" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CP" value="0x01" >
       <value value="0x00" name="All" cname="_CP_ON" />
       <value value="0x01" name="Off" cname="_CP_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
-    <mask name="EBTR" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="EBTR" value="0x01" >
       <value value="0x00" name="All" cname="_EBTR_ON" />
       <value value="0x01" name="Off" cname="_EBTR_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
 
 <!--* Packages *************************************************************-->
   <package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F84J11.xml b/src/devices/pic/xml_data/18F84J11.xml
index 9c69d2b..efdf05a 100644
--- a/src/devices/pic/xml_data/18F84J11.xml
+++ b/src/devices/pic/xml_data/18F84J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F84J90.xml b/src/devices/pic/xml_data/18F84J90.xml
index 59711f3..1236e43 100644
--- a/src/devices/pic/xml_data/18F84J90.xml
+++ b/src/devices/pic/xml_data/18F84J90.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8520.xml b/src/devices/pic/xml_data/18F8520.xml
index 6bc1aae..ed9b7c7 100644
--- a/src/devices/pic/xml_data/18F8520.xml
+++ b/src/devices/pic/xml_data/18F8520.xml
@@ -37,17 +37,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -56,36 +56,36 @@
       <value value="0x05" name="EC_IO"        cname="_OSC_ECIO"  />
       <value value="0x06" name="H4"           cname="_OSC_HSPLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.5" cname="_BORV_25" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -94,134 +94,134 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" cmask="0x02" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" ctqmask="0x02" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MUX_RE7" />
       <value value="0x01" name="RC1" cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x40" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x40" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x40" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x40" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8525.xml b/src/devices/pic/xml_data/18F8525.xml
index e7b5219..7e016eb 100644
--- a/src/devices/pic/xml_data/18F8525.xml
+++ b/src/devices/pic/xml_data/18F8525.xml
@@ -29,17 +29,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -53,36 +53,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -99,130 +99,130 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8527.xml b/src/devices/pic/xml_data/18F8527.xml
index 62c01d4..e5159bd 100644
--- a/src/devices/pic/xml_data/18F8527.xml
+++ b/src/devices/pic/xml_data/18F8527.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -57,42 +57,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -109,154 +109,154 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="ABW"  value="0x30" >
+    </tqmask>
+    <tqmask name="ABW"  value="0x30" >
       <value value="0x00" name="8"  cname="_ADDRBW_ADDR8BIT" />
       <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
       <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
       <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_DATABW_DATA8BIT" />
       <value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX"  value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX"  value="0x02" >
       <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8585.xml b/src/devices/pic/xml_data/18F8585.xml
index 08367ab..85b3561 100644
--- a/src/devices/pic/xml_data/18F8585.xml
+++ b/src/devices/pic/xml_data/18F8585.xml
@@ -29,17 +29,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -53,36 +53,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -99,130 +99,130 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J10.xml b/src/devices/pic/xml_data/18F85J10.xml
index 99b998c..6fab213 100644
--- a/src/devices/pic/xml_data/18F85J10.xml
+++ b/src/devices/pic/xml_data/18F85J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J11.xml b/src/devices/pic/xml_data/18F85J11.xml
index 91b4cc2..0193782 100644
--- a/src/devices/pic/xml_data/18F85J11.xml
+++ b/src/devices/pic/xml_data/18F85J11.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J15.xml b/src/devices/pic/xml_data/18F85J15.xml
index c2445ab..3011a51 100644
--- a/src/devices/pic/xml_data/18F85J15.xml
+++ b/src/devices/pic/xml_data/18F85J15.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J50.xml b/src/devices/pic/xml_data/18F85J50.xml
index dee0637..80199eb 100644
--- a/src/devices/pic/xml_data/18F85J50.xml
+++ b/src/devices/pic/xml_data/18F85J50.xml
@@ -29,16 +29,16 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -47,47 +47,47 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,53 +104,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J90.xml b/src/devices/pic/xml_data/18F85J90.xml
index 61e7571..51d6085 100644
--- a/src/devices/pic/xml_data/18F85J90.xml
+++ b/src/devices/pic/xml_data/18F85J90.xml
@@ -28,55 +28,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -93,45 +93,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8620.xml b/src/devices/pic/xml_data/18F8620.xml
index 8503556..fe596c1 100644
--- a/src/devices/pic/xml_data/18F8620.xml
+++ b/src/devices/pic/xml_data/18F8620.xml
@@ -37,17 +37,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    sdcc_cname="_OSC_LP" />
       <value value="0x01" name="XT"           cname="_XT_OSC"    sdcc_cname="_OSC_XT" />
       <value value="0x02" name="HS"           cname="_HS_OSC"    sdcc_cname="_OSC_HS" />
@@ -56,36 +56,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  sdcc_cname="_OSC_EC_OSC2_RA6" />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  sdcc_cname="_OSC_RC_OSC2" />
-   </mask>
-    <mask name="OSCSEN" value="0x20" >
+   </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  sdcc_cname="_PUT_ON" />
       <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  sdcc_cname="_BODEN_ON" />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
       <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
       <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
       <value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   sdcc_cname="_WDTPS_1_1" />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   sdcc_cname="_WDTPS_1_2" />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   sdcc_cname="_WDTPS_1_4" />
@@ -94,134 +94,134 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  sdcc_cname="_WDTPS_1_32" />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  sdcc_cname="_WDTPS_1_64" />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" sdcc_cname="_PMODE_EXT" />
       <value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" sdcc_cname="_PMODE_MICROPROCESSOR_w_Boot" />
       <value value="0x02" name="Microprocessor"           cname="_MP_MODE"  sdcc_cname="_PMODE_MICROPROCESSOR_" />
       <value value="0x03" name="Microcontroller"          cname="_MC_MODE"  sdcc_cname="_PMODE_MICROCONTROLLER" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7_MICROCONTROLLER__RB3" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON"  sdcc_cname="_CCP2MUX_RC1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  sdcc_cname="_BACKBUG_ON" />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_CP0_ON"  sdcc_cname="_CP_0_ON" />
       <value value="0x01" name="Off"       cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  sdcc_cname="_CP_1_ON" />
       <value value="0x02" name="Off"       cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  sdcc_cname="_CP_2_ON" />
       <value value="0x04" name="Off"       cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  sdcc_cname="_CP_3_ON" />
       <value value="0x08" name="Off"       cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_WRT0_ON"  sdcc_cname="_WRT_0_ON" />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  sdcc_cname="_WRT_1_ON" />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON"  sdcc_cname="_WRT_2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON"  sdcc_cname="_WRT_3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON"  sdcc_cname="_EBTR_0_ON" />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  sdcc_cname="_EBTR_1_ON" />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  sdcc_cname="_EBTR_2_ON" />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON"  sdcc_cname="_EBTR_3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8621.xml b/src/devices/pic/xml_data/18F8621.xml
index e5689ae..654f4a2 100644
--- a/src/devices/pic/xml_data/18F8621.xml
+++ b/src/devices/pic/xml_data/18F8621.xml
@@ -29,17 +29,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -53,36 +53,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -99,142 +99,142 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8622.xml b/src/devices/pic/xml_data/18F8622.xml
index fe29be9..9a38941 100644
--- a/src/devices/pic/xml_data/18F8622.xml
+++ b/src/devices/pic/xml_data/18F8622.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_LP_OSC"     />
       <value value="0x01" name="XT"           cname="_XT_OSC"     />
       <value value="0x02" name="HS"           cname="_HS_OSC"     />
@@ -57,42 +57,42 @@
       <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
       <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FSCM_OFF" />
       <value value="0x40" name="On"  cname="_FSCM_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -109,166 +109,166 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8K"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="ABW"  value="0x30" >
+    </tqmask>
+    <tqmask name="ABW"  value="0x30" >
       <value value="0x00" name="8"  cname="_ADDRBW_ADDR8BIT" />
       <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
       <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
       <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_DATABW_DATA8BIT" />
       <value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CPP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CPP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX"  value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX"  value="0x02" >
       <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB7K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8627.xml b/src/devices/pic/xml_data/18F8627.xml
index 2b7f70b..3a5ab09 100644
--- a/src/devices/pic/xml_data/18F8627.xml
+++ b/src/devices/pic/xml_data/18F8627.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -51,42 +51,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-    </mask>
-    <mask name="FCMEN" value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -103,190 +103,190 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="ABW"  value="0x30" >
+    </tqmask>
+    <tqmask name="ABW"  value="0x30" >
       <value value="0x00" name="8"  cname="_ADDRBW_ADDR8BIT" />
       <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
       <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
       <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_DATABW_DATA8BIT" />
       <value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX"  value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX"  value="0x02" >
       <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8680.xml b/src/devices/pic/xml_data/18F8680.xml
index 97ec3c0..607bf0f 100644
--- a/src/devices/pic/xml_data/18F8680.xml
+++ b/src/devices/pic/xml_data/18F8680.xml
@@ -29,17 +29,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
-    <mask name="FOSC"   value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+    <tqmask name="FOSC"   value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"    />
       <value value="0x01" name="XT"           cname="_OSC_XT"    />
       <value value="0x02" name="HS"           cname="_OSC_HS"    />
@@ -53,36 +53,36 @@
       <value value="0x0D" name="E4S_IO"       cname="_OSC_ECIOSWPLL" />
       <value value="0x0E" name="H4S"          cname="_OSC_HSSWPLL" />
       <value value="0x0F" name="EXTRC_IO"     cname="_OSC_RCIO"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -99,142 +99,142 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="MCLRE"  value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J10.xml b/src/devices/pic/xml_data/18F86J10.xml
index 6cc1ec1..1974a92 100644
--- a/src/devices/pic/xml_data/18F86J10.xml
+++ b/src/devices/pic/xml_data/18F86J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J11.xml b/src/devices/pic/xml_data/18F86J11.xml
index 05e065e..844b0e1 100644
--- a/src/devices/pic/xml_data/18F86J11.xml
+++ b/src/devices/pic/xml_data/18F86J11.xml
@@ -30,55 +30,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -95,53 +95,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J15.xml b/src/devices/pic/xml_data/18F86J15.xml
index bcebf10..e5f94df 100644
--- a/src/devices/pic/xml_data/18F86J15.xml
+++ b/src/devices/pic/xml_data/18F86J15.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J16.xml b/src/devices/pic/xml_data/18F86J16.xml
index b06b858..ce5d2c4 100644
--- a/src/devices/pic/xml_data/18F86J16.xml
+++ b/src/devices/pic/xml_data/18F86J16.xml
@@ -29,55 +29,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,53 +94,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J50.xml b/src/devices/pic/xml_data/18F86J50.xml
index fa67e08..44acae5 100644
--- a/src/devices/pic/xml_data/18F86J50.xml
+++ b/src/devices/pic/xml_data/18F86J50.xml
@@ -29,16 +29,16 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -47,47 +47,47 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,53 +104,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J55.xml b/src/devices/pic/xml_data/18F86J55.xml
index 9b29823..1b9d553 100644
--- a/src/devices/pic/xml_data/18F86J55.xml
+++ b/src/devices/pic/xml_data/18F86J55.xml
@@ -29,16 +29,16 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -47,47 +47,47 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,53 +104,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J60.xml b/src/devices/pic/xml_data/18F86J60.xml
index 42f3d20..3fa4f03 100644
--- a/src/devices/pic/xml_data/18F86J60.xml
+++ b/src/devices/pic/xml_data/18F86J60.xml
@@ -32,55 +32,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -97,31 +97,31 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J65.xml b/src/devices/pic/xml_data/18F86J65.xml
index c2cdf41..d482c93 100644
--- a/src/devices/pic/xml_data/18F86J65.xml
+++ b/src/devices/pic/xml_data/18F86J65.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,31 +94,31 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8720.xml b/src/devices/pic/xml_data/18F8720.xml
index f634b25..8905720 100644
--- a/src/devices/pic/xml_data/18F8720.xml
+++ b/src/devices/pic/xml_data/18F8720.xml
@@ -37,17 +37,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
-    <mask name="FOSC"   value="0x07" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+    <tqmask name="FOSC"   value="0x07" >
       <value value="0x00" name="LP"           cname="_LP_OSC"    />
       <value value="0x01" name="XT"           cname="_XT_OSC"    />
       <value value="0x02" name="HS"           cname="_HS_OSC"    />
@@ -56,36 +56,36 @@
       <value value="0x05" name="EC_IO"        cname="_ECIO_OSC"  />
       <value value="0x06" name="H4"           cname="_HSPLL_OSC" />
       <value value="0x07" name="EXTRC_IO"     cname="_RCIO_OSC"  />
-    </mask>
-    <mask name="OSCSEN" value="0x20" >
+    </tqmask>
+    <tqmask name="OSCSEN" value="0x20" >
       <value value="0x00" name="On"  cname="_OSCS_ON" />
       <value value="0x20" name="Off" cname="_OSCS_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x02" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x02" >
       <value value="0x00" name="Off" cname="_BOR_OFF" />
       <value value="0x02" name="On"  cname="_BOR_ON"  />
-    </mask>
-    <mask name="BORV"  value="0x0C" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0C" >
       <value value="0x00" name="4.5" cname="_BORV_45" />
       <value value="0x04" name="4.2" cname="_BORV_42" />
       <value value="0x08" name="2.7" cname="_BORV_27" />
       <value value="0x0C" name="2.0" cname="_BORV_20" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x0E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x0E" >
       <value value="0x00" name="1:1"   cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"   cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"   cname="_WDTPS_4"   />
@@ -94,182 +94,182 @@
       <value value="0x0A" name="1:32"  cname="_WDTPS_32"  />
       <value value="0x0C" name="1:64"  cname="_WDTPS_64"  />
       <value value="0x0E" name="1:128" cname="_WDTPS_128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" />
       <value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" />
       <value value="0x02" name="Microprocessor"           cname="_MP_MODE" />
       <value value="0x03" name="Microcontroller"          cname="_MC_MODE" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
       <value value="0x01" name="RC1" cname="_CCP2MX_ON" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVR_OFF" />
       <value value="0x01" name="On"  cname="_STVR_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"       cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
-    <mask name="CP_6" value="0x40" >
+    </tqmask>
+    <tqmask name="CP_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
       <value value="0x40" name="Off"         cname="_CP6_OFF" />
-    </mask>
-    <mask name="CP_7" value="0x80" >
+    </tqmask>
+    <tqmask name="CP_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
       <value value="0x80" name="Off"         cname="_CP7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_CPB_ON"  />
       <value value="0x40" name="Off"       cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"       cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
-    <mask name="WRT_6" value="0x40" >
+    </tqmask>
+    <tqmask name="WRT_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
       <value value="0x40" name="Off"         cname="_WRT6_OFF" />
-    </mask>
-    <mask name="WRT_7" value="0x80" >
+    </tqmask>
+    <tqmask name="WRT_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
       <value value="0x80" name="Off"         cname="_WRT7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="0000:01FF" cname="_WRTB_ON"  />
       <value value="0x40" name="Off"       cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"       cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
-    <mask name="EBTR_6" value="0x40" >
+    </tqmask>
+    <tqmask name="EBTR_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
       <value value="0x40" name="Off"         cname="_EBTR6_OFF" />
-    </mask>
-    <mask name="EBTR_7" value="0x80" >
+    </tqmask>
+    <tqmask name="EBTR_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
       <value value="0x80" name="Off"         cname="_EBTR7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
       <value value="0x40" name="Off"       cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8722.xml b/src/devices/pic/xml_data/18F8722.xml
index 3db0bbd..8cdffbb 100644
--- a/src/devices/pic/xml_data/18F8722.xml
+++ b/src/devices/pic/xml_data/18F8722.xml
@@ -30,17 +30,17 @@
 
 <!--* Memory ***************************************************************-->
   <memory name="code"      start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" />
-  <memory name="user_ids"     start="0x200000" end="0x200007" rmask="0x0F"              />
+  <memory name="user_ids"     start="0x200000" end="0x200007" rtqmask="0x0F"              />
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
   <memory name="config"       start="0x300000" end="0x30000D" />
   <memory name="eeprom"       start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
   <memory name="debug_vector" start="0x200028" end="0x200037" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
-    <mask name="FOSC"  value="0x0F" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FOSC"  value="0x0F" >
       <value value="0x00" name="LP"           cname="_OSC_LP"     />
       <value value="0x01" name="XT"           cname="_OSC_XT"     />
       <value value="0x02" name="HS"           cname="_OSC_HS"     />
@@ -51,42 +51,42 @@
       <value value="0x08" name="INTRC_IO"     cname="_OSC_INTIO67" />
       <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
       <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC"     />
-   </mask>
-    <mask name="FCMEN" value="0x40" >
+   </tqmask>
+    <tqmask name="FCMEN" value="0x40" >
       <value value="0x00" name="Off" cname="_FCMEN_OFF" />
       <value value="0x40" name="On"  cname="_FCMEN_ON"  />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="Off" cname="_IESO_OFF" />
       <value value="0x80" name="On"  cname="_IESO_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
-    <mask name="PWRTE" value="0x01" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="PWRTE" value="0x01" >
       <value value="0x00" name="On"  cname="_PWRT_ON"  />
       <value value="0x01" name="Off" cname="_PWRT_OFF" />
-    </mask>
-    <mask name="BODEN" value="0x06" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x06" >
       <value value="0x00" name="Off"      cname="_BOREN_OFF" />
       <value value="0x02" name="Software" cname="_BOREN_ON" />
       <value value="0x04" name="On_run"   cname="_BOREN_NOSLP" />
       <value value="0x06" name="On"       cname="_BOREN_SBORDIS" />
-    </mask>
-    <mask name="BORV"  value="0x18" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x18" >
       <value value="0x00" name="4.5" cname="_BORV_0" />
       <value value="0x08" name="4.2" cname="_BORV_1" />
       <value value="0x10" name="2.7" cname="_BORV_2" />
       <value value="0x18" name="2.0" cname="_BORV_3" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
-    <mask name="WDT"   value="0x01" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+    <tqmask name="WDT"   value="0x01" >
       <value value="0x00" name="Off" cname="_WDT_OFF" />
       <value value="0x01" name="On"  cname="_WDT_ON"  />
-    </mask>
-    <mask name="WDTPS" value="0x1E" >
+    </tqmask>
+    <tqmask name="WDTPS" value="0x1E" >
       <value value="0x00" name="1:1"     cname="_WDTPS_1"   />
       <value value="0x02" name="1:2"     cname="_WDTPS_2"   />
       <value value="0x04" name="1:4"     cname="_WDTPS_4"   />
@@ -103,214 +103,214 @@
       <value value="0x1A" name="1:8192"  cname="_WDTPS_8192"  />
       <value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
       <value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
-    <mask name="PM"   value="0x03" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+    <tqmask name="PM"   value="0x03" >
       <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
       <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
       <value value="0x02" name="Microprocessor"           cname="_MODE_MP" />
       <value value="0x03" name="Microcontroller"          cname="_MODE_MC" />
-    </mask>
-    <mask name="ABW"  value="0x30" >
+    </tqmask>
+    <tqmask name="ABW"  value="0x30" >
       <value value="0x00" name="8"  cname="_ADDRBW_ADDR8BIT" />
       <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
       <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
       <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
-    </mask>
-    <mask name="BW"   value="0x40" >
+    </tqmask>
+    <tqmask name="BW"   value="0x40" >
       <value value="0x00" name="8"  cname="_DATABW_DATA8BIT" />
       <value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
-    </mask>
-    <mask name="WAIT" value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On"  cname="_WAIT_ON" />
       <value value="0x80" name="Off" cname="_WAIT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
       <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
-    </mask>
-    <mask name="ECCPMX"  value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX"  value="0x02" >
       <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
       <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
-    </mask>
-    <mask name="LPT1OSC" value="0x04" >
+    </tqmask>
+    <tqmask name="LPT1OSC" value="0x04" >
       <value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
       <value value="0x04" name="On"  cname="_LPT1OSC_ON" />
-    </mask>
-    <mask name="MCLRE"   value="0x80" >
+    </tqmask>
+    <tqmask name="MCLRE"   value="0x80" >
       <value value="0x00" name="Internal" cname="_MCLRE_OFF" />
       <value value="0x80" name="External" cname="_MCLRE_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
-    <mask name="STVREN" value="0x01" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+    <tqmask name="STVREN" value="0x01" >
       <value value="0x00" name="Off" cname="_STVREN_OFF" />
       <value value="0x01" name="On"  cname="_STVREN_ON"  />
-    </mask>
-    <mask name="LVP"    value="0x04" >
+    </tqmask>
+    <tqmask name="LVP"    value="0x04" >
       <value value="0x00" name="Off" cname="_LVP_OFF" />
       <value value="0x04" name="On"  cname="_LVP_ON"  />
-    </mask>
-    <mask name="BBSIZ"  value="0x30" >
+    </tqmask>
+    <tqmask name="BBSIZ"  value="0x30" >
       <value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
       <value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
       <value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
       <value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
-    </mask>
-    <mask name="XINST"  value="0x40" >
+    </tqmask>
+    <tqmask name="XINST"  value="0x40" >
       <value value="0x00" name="Off" cname="_XINST_OFF" />
       <value value="0x40" name="On"  cname="_XINST_ON" />
-    </mask>
-    <mask name="DEBUG"  value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG"  value="0x80" >
       <value value="0x00" name="On"  cname="_DEBUG_ON"  />
       <value value="0x80" name="Off" cname="_DEBUG_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
 
-  <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="CP_0" value="0x01" >
+  <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="CP_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON"  />
       <value value="0x01" name="Off"                 cname="_CP0_OFF" />
-    </mask>
-    <mask name="CP_1" value="0x02" >
+    </tqmask>
+    <tqmask name="CP_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_CP1_ON"  />
       <value value="0x02" name="Off"       cname="_CP1_OFF" />
-    </mask>
-    <mask name="CP_2" value="0x04" >
+    </tqmask>
+    <tqmask name="CP_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_CP2_ON"  />
       <value value="0x04" name="Off"       cname="_CP2_OFF" />
-    </mask>
-    <mask name="CP_3" value="0x08" >
+    </tqmask>
+    <tqmask name="CP_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_CP3_ON"  />
       <value value="0x08" name="Off"       cname="_CP3_OFF" />
-    </mask>
-    <mask name="CP_4" value="0x10" >
+    </tqmask>
+    <tqmask name="CP_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
       <value value="0x10" name="Off"         cname="_CP4_OFF" />
-    </mask>
-    <mask name="CP_5" value="0x20" >
+    </tqmask>
+    <tqmask name="CP_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
       <value value="0x20" name="Off"         cname="_CP5_OFF" />
-    </mask>
-    <mask name="CP_6" value="0x40" >
+    </tqmask>
+    <tqmask name="CP_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
       <value value="0x40" name="Off"         cname="_CP6_OFF" />
-    </mask>
-    <mask name="CP_7" value="0x80" >
+    </tqmask>
+    <tqmask name="CP_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
       <value value="0x80" name="Off"         cname="_CP7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
-    <mask name="CPB" value="0x40" >
+  <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+    <tqmask name="CPB" value="0x40" >
       <value value="0x00" name="All" cname="_CPB_ON"  />
       <value value="0x40" name="Off" cname="_CPB_OFF" />
-    </mask>
-    <mask name="CPD" value="0x80" >
+    </tqmask>
+    <tqmask name="CPD" value="0x80" >
       <value value="0x00" name="All" cname="_CPD_ON"  />
       <value value="0x80" name="Off" cname="_CPD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="WRT_0" value="0x01" >
+  <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="WRT_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON"  />
       <value value="0x01" name="Off"                 cname="_WRT0_OFF" />
-    </mask>
-    <mask name="WRT_1" value="0x02" >
+    </tqmask>
+    <tqmask name="WRT_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_WRT1_ON"  />
       <value value="0x02" name="Off"       cname="_WRT1_OFF" />
-    </mask>
-    <mask name="WRT_2" value="0x04" >
+    </tqmask>
+    <tqmask name="WRT_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
       <value value="0x04" name="Off"       cname="_WRT2_OFF" />
-    </mask>
-    <mask name="WRT_3" value="0x08" >
+    </tqmask>
+    <tqmask name="WRT_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
       <value value="0x08" name="Off"       cname="_WRT3_OFF" />
-    </mask>
-    <mask name="WRT_4" value="0x10" >
+    </tqmask>
+    <tqmask name="WRT_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
       <value value="0x10" name="Off"         cname="_WRT4_OFF" />
-    </mask>
-    <mask name="WRT_5" value="0x20" >
+    </tqmask>
+    <tqmask name="WRT_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
       <value value="0x20" name="Off"         cname="_WRT5_OFF" />
-    </mask>
-    <mask name="WRT_6" value="0x40" >
+    </tqmask>
+    <tqmask name="WRT_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
       <value value="0x40" name="Off"         cname="_WRT6_OFF" />
-    </mask>
-    <mask name="WRT_7" value="0x80" >
+    </tqmask>
+    <tqmask name="WRT_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
       <value value="0x80" name="Off"         cname="_WRT7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
-    <mask name="WRTC" value="0x20" >
+  <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+    <tqmask name="WRTC" value="0x20" >
       <value value="0x00" name="All" cname="_WRTC_ON"  />
       <value value="0x20" name="Off" cname="_WRTC_OFF" />
-    </mask>
-    <mask name="WRTB" value="0x40" >
+    </tqmask>
+    <tqmask name="WRTB" value="0x40" >
       <value value="0x00" name="All" cname="_WRTB_ON"  />
       <value value="0x40" name="Off" cname="_WRTB_OFF" />
-    </mask>
-    <mask name="WRTD" value="0x80" >
+    </tqmask>
+    <tqmask name="WRTD" value="0x80" >
       <value value="0x00" name="All" cname="_WRTD_ON"  />
       <value value="0x80" name="Off" cname="_WRTD_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
-    <mask name="EBTR_0" value="0x01" >
+  <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+    <tqmask name="EBTR_0" value="0x01" >
       <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON"  />
       <value value="0x01" name="Off"                 cname="_EBTR0_OFF" />
-    </mask>
-    <mask name="EBTR_1" value="0x02" >
+    </tqmask>
+    <tqmask name="EBTR_1" value="0x02" >
       <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON"  />
       <value value="0x02" name="Off"       cname="_EBTR1_OFF" />
-    </mask>
-    <mask name="EBTR_2" value="0x04" >
+    </tqmask>
+    <tqmask name="EBTR_2" value="0x04" >
       <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON"  />
       <value value="0x04" name="Off"       cname="_EBTR2_OFF" />
-    </mask>
-    <mask name="EBTR_3" value="0x08" >
+    </tqmask>
+    <tqmask name="EBTR_3" value="0x08" >
       <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
       <value value="0x08" name="Off"       cname="_EBTR3_OFF" />
-    </mask>
-    <mask name="EBTR_4" value="0x10" >
+    </tqmask>
+    <tqmask name="EBTR_4" value="0x10" >
       <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
       <value value="0x10" name="Off"         cname="_EBTR4_OFF" />
-    </mask>
-    <mask name="EBTR_5" value="0x20" >
+    </tqmask>
+    <tqmask name="EBTR_5" value="0x20" >
       <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
       <value value="0x20" name="Off"         cname="_EBTR5_OFF" />
-    </mask>
-    <mask name="EBTR_6" value="0x40" >
+    </tqmask>
+    <tqmask name="EBTR_6" value="0x40" >
       <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
       <value value="0x40" name="Off"         cname="_EBTR6_OFF" />
-    </mask>
-    <mask name="EBTR_7" value="0x80" >
+    </tqmask>
+    <tqmask name="EBTR_7" value="0x80" >
       <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
       <value value="0x80" name="Off"         cname="_EBTR7_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
-    <mask name="EBTRB" value="0x40" >
+  <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+    <tqmask name="EBTRB" value="0x40" >
       <value value="0x00" name="All" cname="_EBTRB_ON" />
       <value value="0x40" name="Off" cname="_EBTRB_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J10.xml b/src/devices/pic/xml_data/18F87J10.xml
index bc21af2..d7790cb 100644
--- a/src/devices/pic/xml_data/18F87J10.xml
+++ b/src/devices/pic/xml_data/18F87J10.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xC1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xC1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,45 +94,45 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
-    <mask name="CCP2MX"  value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+    <tqmask name="CCP2MX"  value="0x01" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x01" name="RC1" cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J11.xml b/src/devices/pic/xml_data/18F87J11.xml
index d3c84fb..495ecda 100644
--- a/src/devices/pic/xml_data/18F87J11.xml
+++ b/src/devices/pic/xml_data/18F87J11.xml
@@ -29,55 +29,55 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,53 +94,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J50.xml b/src/devices/pic/xml_data/18F87J50.xml
index 1749435..24207fe 100644
--- a/src/devices/pic/xml_data/18F87J50.xml
+++ b/src/devices/pic/xml_data/18F87J50.xml
@@ -29,16 +29,16 @@
   <memory name="device_id"    start="0x3FFFFE" end="0x3FFFFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="PLLDIV"  value="0x0E" >
+    </tqmask>
+    <tqmask name="PLLDIV"  value="0x0E" >
       <value value="0x00" name="12" cname="" />
       <value value="0x02" name="10" cname="" />
       <value value="0x04" name="6"  cname="" />
@@ -47,47 +47,47 @@
       <value value="0x0A" name="3"  cname="" />
       <value value="0x0C" name="2"  cname="" />
       <value value="0x0E" name="1"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -104,53 +104,53 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="EASHFT"  value="0x08" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="EASHFT"  value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On"  cname="" />
-    </mask>
-    <mask name="EMB"  value="0x30" >
+    </tqmask>
+    <tqmask name="EMB"  value="0x30" >
       <value value="0x00" name="20BIT"    cname="" />
       <value value="0x10" name="16BIT"    cname="" />
       <value value="0x20" name="12BIT"    cname="" />
       <value value="0x30" name="Disabled" cname="" />
-    </mask>
-    <mask name="BW"  value="0x40" >
+    </tqmask>
+    <tqmask name="BW"  value="0x40" >
       <value value="0x00" name="8"  cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="WAIT"  value="0x80" >
+    </tqmask>
+    <tqmask name="WAIT"  value="0x80" >
       <value value="0x00" name="On"  cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="CCP2MX" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="CCP2MX" value="0x01" >
       <value value="0x00" name="RB3"  cname=""  />
       <value value="0x01" name="RC1"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"  cname=""  />
       <value value="0x02" name="RE6-RE3"   cname="" />
-    </mask>
-    <mask name="PMPMX" value="0x04" >
+    </tqmask>
+    <tqmask name="PMPMX" value="0x04" >
       <value value="0x00" name="NotConnected"  cname="" />
       <value value="0x04" name="Connected"     cname="" />
-    </mask>
-    <mask name="MSSPSEL" value="0x08" >
+    </tqmask>
+    <tqmask name="MSSPSEL" value="0x08" >
       <value value="0x00" name="5BIT"  cname="" />
       <value value="0x08" name="7BIT"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J60.xml b/src/devices/pic/xml_data/18F87J60.xml
index d101ed3..fcf788a 100644
--- a/src/devices/pic/xml_data/18F87J60.xml
+++ b/src/devices/pic/xml_data/18F87J60.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="0000:FFF7" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,31 +94,31 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F96J60.xml b/src/devices/pic/xml_data/18F96J60.xml
index 655b586..9b3dca7 100644
--- a/src/devices/pic/xml_data/18F96J60.xml
+++ b/src/devices/pic/xml_data/18F96J60.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,49 +94,49 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="WAIT" value="0x80" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
-    <mask name="BW" value="0x40" >
+    </tqmask>
+    <tqmask name="BW" value="0x40" >
       <value value="0x00" name="8" cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="EMB" value="0x30" >
+    </tqmask>
+    <tqmask name="EMB" value="0x30" >
       <value value="0x00" name="Disabled" cname="" />
       <value value="0x10" name="12BIT" cname="" />
       <value value="0x20" name="16BIT" cname="" />
       <value value="0x30" name="20BIT" cname="" />
-    </mask>
-    <mask name="EASHFT" value="0x08" >
+    </tqmask>
+    <tqmask name="EASHFT" value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F96J65.xml b/src/devices/pic/xml_data/18F96J65.xml
index a61bb94..678e2f3 100644
--- a/src/devices/pic/xml_data/18F96J65.xml
+++ b/src/devices/pic/xml_data/18F96J65.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,49 +94,49 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="WAIT" value="0x80" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
-    <mask name="BW" value="0x40" >
+    </tqmask>
+    <tqmask name="BW" value="0x40" >
       <value value="0x00" name="8" cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="EMB" value="0x30" >
+    </tqmask>
+    <tqmask name="EMB" value="0x30" >
       <value value="0x00" name="Disabled" cname="" />
       <value value="0x10" name="12BIT" cname="" />
       <value value="0x20" name="16BIT" cname="" />
       <value value="0x30" name="20BIT" cname="" />
-    </mask>
-    <mask name="EASHFT" value="0x08" >
+    </tqmask>
+    <tqmask name="EASHFT" value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F97J60.xml b/src/devices/pic/xml_data/18F97J60.xml
index ce570ba..a47d6d1 100644
--- a/src/devices/pic/xml_data/18F97J60.xml
+++ b/src/devices/pic/xml_data/18F97J60.xml
@@ -29,55 +29,55 @@
 
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
-    <mask name="WDT"  value="0x01" >
+  <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+    <tqmask name="WDT"  value="0x01" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x01" name="On"  cname="" />
-    </mask>
-    <mask name="STVREN" value="0x20" >
+    </tqmask>
+    <tqmask name="STVREN" value="0x20" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x20" name="On"  cname="" />
-    </mask>
-    <mask name="XINST" value="0x40" >
+    </tqmask>
+    <tqmask name="XINST" value="0x40" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x40" name="On"  cname="" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
-    <mask name="CP" value="0x04" >
+  <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+    <tqmask name="CP" value="0x04" >
       <value value="0x00" name="All" cname="" />
       <value value="0x04" name="Off"  cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
-    <mask name="FOSC"   value="0x03" >
+  <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="FOSC"   value="0x03" >
       <value value="0x00" name="HS"           cname=""    />
       <value value="0x01" name="HSPLL"        cname=""    />
       <value value="0x02" name="EC"           cname=""    />
       <value value="0x03" name="ECPLL_IO"     cname=""    />
-    </mask>
-    <mask name="FOSC2"  value="0x04" >
+    </tqmask>
+    <tqmask name="FOSC2"  value="0x04" >
       <value value="0x00" name="FOSC1:FOSC0"  cname=""    />
       <value value="0x04" name="INTRC"        cname=""    />
-    </mask>
-    <mask name="FCMEN"  value="0x40" >
+    </tqmask>
+    <tqmask name="FCMEN"  value="0x40" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x40" name="Off"  cname=""    />
-    </mask>
-    <mask name="IESO"  value="0x80" >
+    </tqmask>
+    <tqmask name="IESO"  value="0x80" >
       <value value="0x00" name="On"   cname=""    />
       <value value="0x80" name="Off"  cname=""    />
-     </mask>
+     </tqmask>
   </config>
 
-  <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WDTPS" value="0x0F" >
+  <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WDTPS" value="0x0F" >
       <value value="0x00" name="1:1"     cname=""   />
       <value value="0x01" name="1:2"     cname=""   />
       <value value="0x02" name="1:4"     cname=""   />
@@ -94,49 +94,49 @@
       <value value="0x0D" name="1:8192"  cname=""  />
       <value value="0x0E" name="1:16384" cname="" />
       <value value="0x0F" name="1:32768" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
-    <mask name="WAIT" value="0x80" >
+  <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+    <tqmask name="WAIT" value="0x80" >
       <value value="0x00" name="On" cname="" />
       <value value="0x80" name="Off" cname="" />
-    </mask>
-    <mask name="BW" value="0x40" >
+    </tqmask>
+    <tqmask name="BW" value="0x40" >
       <value value="0x00" name="8" cname="" />
       <value value="0x40" name="16" cname="" />
-    </mask>
-    <mask name="EMB" value="0x30" >
+    </tqmask>
+    <tqmask name="EMB" value="0x30" >
       <value value="0x00" name="Disabled" cname="" />
       <value value="0x10" name="12BIT" cname="" />
       <value value="0x20" name="16BIT" cname="" />
       <value value="0x30" name="20BIT" cname="" />
-    </mask>
-    <mask name="EASHFT" value="0x08" >
+    </tqmask>
+    <tqmask name="EASHFT" value="0x08" >
       <value value="0x00" name="Off" cname="" />
       <value value="0x08" name="On" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
-    <mask name="ETHLED" value="0x01" >
+  <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="ETHLED" value="0x01" >
       <value value="0x00" name="Off"  cname=""  />
       <value value="0x01" name="On"   cname="" />
-    </mask>
-    <mask name="ECCPMX" value="0x02" >
+    </tqmask>
+    <tqmask name="ECCPMX" value="0x02" >
       <value value="0x00" name="RH7-RH4"     cname="" />
       <value value="0x02" name="RE6-RE3"     cname=""  />
-    </mask>
-    <mask name="CCP2MX"  value="0x04" >
+    </tqmask>
+    <tqmask name="CCP2MX"  value="0x04" >
       <value value="0x00" name="RE7" cname="" />
       <value value="0x04" name="RC1" cname="" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA006.xml b/src/devices/pic/xml_data/24FJ128GA006.xml
index 7f264b9..a68bc37 100644
--- a/src/devices/pic/xml_data/24FJ128GA006.xml
+++ b/src/devices/pic/xml_data/24FJ128GA006.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x0157FB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x0157FC" end="0x0157FF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA008.xml b/src/devices/pic/xml_data/24FJ128GA008.xml
index b8d43d8..14e4f29 100644
--- a/src/devices/pic/xml_data/24FJ128GA008.xml
+++ b/src/devices/pic/xml_data/24FJ128GA008.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x0157FB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x0157FC" end="0x0157FF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA010.xml b/src/devices/pic/xml_data/24FJ128GA010.xml
index d57c7ff..cb01c2d 100644
--- a/src/devices/pic/xml_data/24FJ128GA010.xml
+++ b/src/devices/pic/xml_data/24FJ128GA010.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x0157FB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x0157FC" end="0x0157FF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA002.xml b/src/devices/pic/xml_data/24FJ64GA002.xml
index e051b07..90b9f05 100644
--- a/src/devices/pic/xml_data/24FJ64GA002.xml
+++ b/src/devices/pic/xml_data/24FJ64GA002.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00ABFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00ABFC" end="0x00ABFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,69 +47,69 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000300" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000300" >
       <value value="0x000000" name="invalid" />
       <value value="0x000100" name="EMUC3, EMUD3" />
       <value value="0x000200" name="EMUC2, EMUD2" />
       <value value="0x000300" name="EMUC1, EMUD1" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="I2C1SEL" value="0x000004" >
+    </tqmask>
+    <tqmask name="I2C1SEL" value="0x000004" >
       <value value="0x000000" name="Alternate" />
       <value value="0x000004" name="Default" />
-    </mask>
-    <mask name="IOL1WAY" value="0x000010" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x000010" >
       <value value="0x000000" name="Multiple reconfigurations" />
       <value value="0x000010" name="One reconfiguration" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -118,11 +118,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA004.xml b/src/devices/pic/xml_data/24FJ64GA004.xml
index c87748e..8cda66c 100644
--- a/src/devices/pic/xml_data/24FJ64GA004.xml
+++ b/src/devices/pic/xml_data/24FJ64GA004.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00ABFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00ABFC" end="0x00ABFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,69 +47,69 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000300" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000300" >
       <value value="0x000000" name="invalid" />
       <value value="0x000100" name="EMUC3, EMUD3" />
       <value value="0x000200" name="EMUC2, EMUD2" />
       <value value="0x000300" name="EMUC1, EMUD1" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="I2C1SEL" value="0x000004" >
+    </tqmask>
+    <tqmask name="I2C1SEL" value="0x000004" >
       <value value="0x000000" name="Alternate" />
       <value value="0x000004" name="Default" />
-    </mask>
-    <mask name="IOL1WAY" value="0x000010" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x000010" >
       <value value="0x000000" name="Multiple reconfigurations" />
       <value value="0x000010" name="One reconfiguration" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -118,11 +118,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA006.xml b/src/devices/pic/xml_data/24FJ64GA006.xml
index 6492f51..dab1819 100644
--- a/src/devices/pic/xml_data/24FJ64GA006.xml
+++ b/src/devices/pic/xml_data/24FJ64GA006.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00ABFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00ABFC" end="0x00ABFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA008.xml b/src/devices/pic/xml_data/24FJ64GA008.xml
index 2ead302..5149c82 100644
--- a/src/devices/pic/xml_data/24FJ64GA008.xml
+++ b/src/devices/pic/xml_data/24FJ64GA008.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00ABFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00ABFC" end="0x00ABFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA010.xml b/src/devices/pic/xml_data/24FJ64GA010.xml
index 627da04..43f2806 100644
--- a/src/devices/pic/xml_data/24FJ64GA010.xml
+++ b/src/devices/pic/xml_data/24FJ64GA010.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00ABFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00ABFC" end="0x00ABFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA006.xml b/src/devices/pic/xml_data/24FJ96GA006.xml
index 9f02be4..2b17512 100644
--- a/src/devices/pic/xml_data/24FJ96GA006.xml
+++ b/src/devices/pic/xml_data/24FJ96GA006.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00FFFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00FFFC" end="0x00FFFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA008.xml b/src/devices/pic/xml_data/24FJ96GA008.xml
index eeba6d2..ee3212e 100644
--- a/src/devices/pic/xml_data/24FJ96GA008.xml
+++ b/src/devices/pic/xml_data/24FJ96GA008.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00FFFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00FFFC" end="0x00FFFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA010.xml b/src/devices/pic/xml_data/24FJ96GA010.xml
index 700d288..e609719 100644
--- a/src/devices/pic/xml_data/24FJ96GA010.xml
+++ b/src/devices/pic/xml_data/24FJ96GA010.xml
@@ -24,13 +24,13 @@
   <memory name="code"              start="0x000200" end="0x00FFFB" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0x00FFFC" end="0x00FFFF" />
-<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!--   <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8007EF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
-    <mask name="WDTPOST" value="0x00000F" >
+  <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+    <tqmask name="WDTPOST" value="0x00000F" >
       <value value="0x000000" name="1:1" />
       <value value="0x000001" name="1:2" />
       <value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
       <value value="0x00000D" name="1:8192" />
       <value value="0x00000E" name="1:16384" />
       <value value="0x00000F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x000010" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x000010" >
       <value value="0x000000" name="1:32" />
       <value value="0x000010" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x000040" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x000040" >
       <value value="0x000000" name="On" />
       <value value="0x000040" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x000080" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x000080" >
       <value value="0x000000" name="Software" />
       <value value="0x000080" name="On" />
-    </mask>
-    <mask name="ICS" value="0x000100" >
+    </tqmask>
+    <tqmask name="ICS" value="0x000100" >
       <value value="0x000000" name="EMUC1, EMUD1" />
       <value value="0x000100" name="EMUC2, EMUD2" />
-    </mask>
-    <mask name="DEBUG" value="0x000800" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x000800" >
       <value value="0x000000" name="On" />
       <value value="0x000800" name="Off" />
-    </mask>
-    <mask name="GWRP" value="0x001000" >
+    </tqmask>
+    <tqmask name="GWRP" value="0x001000" >
       <value value="0x000000" name="All" />
       <value value="0x001000" name="Off" />
-    </mask>
-    <mask name="GCP" value="0x002000" >
+    </tqmask>
+    <tqmask name="GCP" value="0x002000" >
       <value value="0x000000" name="All" />
       <value value="0x002000" name="Off" />
-    </mask>
-    <mask name="JTAGEN" value="0x004000" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x004000" >
       <value value="0x000000" name="Off" />
       <value value="0x004000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
-    <mask name="POSCMD" value="0x000003" >
+  <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+    <tqmask name="POSCMD" value="0x000003" >
       <value value="0x000000" name="EC" />
       <value value="0x000001" name="XT" />
       <value value="0x000002" name="HS" />
       <value value="0x000003" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x000020" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x000020" >
       <value value="0x000000" name="IO" />
       <value value="0x000020" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0x0000C0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0x0000C0" >
       <value value="0x000000" name="Switching on, monitor on" />
       <value value="0x000040" name="Switching on, monitor off" />
       <value value="0x000080" name="Switching off, monitor off" />
       <value value="0x0000C0" name="Switching off, monitor off" />
-    </mask>
-    <mask name="FNOSC" value="0x000700" >
+    </tqmask>
+    <tqmask name="FNOSC" value="0x000700" >
       <value value="0x000000" name="EXTRC_F" />
       <value value="0x000100" name="INTRC_F_PLL" />
       <value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
       <value value="0x000500" name="EXTRC_LP" />
       <value value="0x000600" name="invalid" />
       <value value="0x000700" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x008000" >
+    </tqmask>
+    <tqmask name="IESO" value="0x008000" >
       <value value="0x000000" name="Off" />
       <value value="0x008000" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP206.xml b/src/devices/pic/xml_data/24HJ128GP206.xml
index c065e99..60c824c 100644
--- a/src/devices/pic/xml_data/24HJ128GP206.xml
+++ b/src/devices/pic/xml_data/24HJ128GP206.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP210.xml b/src/devices/pic/xml_data/24HJ128GP210.xml
index b0922d0..6e1983d 100644
--- a/src/devices/pic/xml_data/24HJ128GP210.xml
+++ b/src/devices/pic/xml_data/24HJ128GP210.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP306.xml b/src/devices/pic/xml_data/24HJ128GP306.xml
index 97f23e1..7e8f67e 100644
--- a/src/devices/pic/xml_data/24HJ128GP306.xml
+++ b/src/devices/pic/xml_data/24HJ128GP306.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP310.xml b/src/devices/pic/xml_data/24HJ128GP310.xml
index a600601..8e148b0 100644
--- a/src/devices/pic/xml_data/24HJ128GP310.xml
+++ b/src/devices/pic/xml_data/24HJ128GP310.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP506.xml b/src/devices/pic/xml_data/24HJ128GP506.xml
index ae2fd06..ddb2d13 100644
--- a/src/devices/pic/xml_data/24HJ128GP506.xml
+++ b/src/devices/pic/xml_data/24HJ128GP506.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP510.xml b/src/devices/pic/xml_data/24HJ128GP510.xml
index 7195e60..80a0f24 100644
--- a/src/devices/pic/xml_data/24HJ128GP510.xml
+++ b/src/devices/pic/xml_data/24HJ128GP510.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x0157FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ12GP201.xml b/src/devices/pic/xml_data/24HJ12GP201.xml
index b0c3357..3dccc43 100644
--- a/src/devices/pic/xml_data/24HJ12GP201.xml
+++ b/src/devices/pic/xml_data/24HJ12GP201.xml
@@ -21,46 +21,46 @@
   <memory name="code"           start="0x000200" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="1792" />
       <value value="0x02" name="768" />
       <value value="0x04" name="256" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -69,38 +69,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="IOL1WAY" value="0x20" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x20" >
       <value value="0x00" name="Multiple reconfigurations" />
       <value value="0x20" name="One reconfiguration" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -117,23 +117,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -142,32 +142,32 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
-    <mask name="ALTI2C" value="0x10" >
+    </tqmask>
+    <tqmask name="ALTI2C" value="0x10" >
       <value value="0x00" name="ASDA1/ASCL1" />
       <value value="0x10" name="SDA1/SCL1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ12GP202.xml b/src/devices/pic/xml_data/24HJ12GP202.xml
index 60fdce8..10dfdbb 100644
--- a/src/devices/pic/xml_data/24HJ12GP202.xml
+++ b/src/devices/pic/xml_data/24HJ12GP202.xml
@@ -21,46 +21,46 @@
   <memory name="code"           start="0x000200" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="1792" />
       <value value="0x02" name="768" />
       <value value="0x04" name="256" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -69,38 +69,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="IOL1WAY" value="0x20" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x20" >
       <value value="0x00" name="Multiple reconfigurations" />
       <value value="0x20" name="One reconfiguration" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -117,23 +117,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -142,32 +142,32 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
-    <mask name="ALTI2C" value="0x10" >
+    </tqmask>
+    <tqmask name="ALTI2C" value="0x10" >
       <value value="0x00" name="ASDA1/ASCL1" />
       <value value="0x10" name="SDA1/SCL1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ16GP304.xml b/src/devices/pic/xml_data/24HJ16GP304.xml
index f4d50d8..09096ec 100644
--- a/src/devices/pic/xml_data/24HJ16GP304.xml
+++ b/src/devices/pic/xml_data/24HJ16GP304.xml
@@ -24,46 +24,46 @@
   <memory name="code"              start="0x000200" end="0x002BFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="1792" />
       <value value="0x02" name="768" />
       <value value="0x04" name="256" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="IOL1WAY" value="0x20" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x20" >
       <value value="0x00" name="Multiple reconfigurations" />
       <value value="0x20" name="One reconfiguration" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -145,32 +145,32 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
-    <mask name="ALTI2C" value="0x10" >
+    </tqmask>
+    <tqmask name="ALTI2C" value="0x10" >
       <value value="0x00" name="ASDA1/ASCL1" />
       <value value="0x10" name="SDA1/SCL1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP206.xml b/src/devices/pic/xml_data/24HJ256GP206.xml
index d977b29..3335305 100644
--- a/src/devices/pic/xml_data/24HJ256GP206.xml
+++ b/src/devices/pic/xml_data/24HJ256GP206.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x02ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP210.xml b/src/devices/pic/xml_data/24HJ256GP210.xml
index 000bc00..60f9102 100644
--- a/src/devices/pic/xml_data/24HJ256GP210.xml
+++ b/src/devices/pic/xml_data/24HJ256GP210.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x02ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP610.xml b/src/devices/pic/xml_data/24HJ256GP610.xml
index 4c1e714..3189c39 100644
--- a/src/devices/pic/xml_data/24HJ256GP610.xml
+++ b/src/devices/pic/xml_data/24HJ256GP610.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x02ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="32768" />
       <value value="0x02" name="16384"  />
       <value value="0x04" name="8192"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ32GP202.xml b/src/devices/pic/xml_data/24HJ32GP202.xml
index d93607a..6f67086 100644
--- a/src/devices/pic/xml_data/24HJ32GP202.xml
+++ b/src/devices/pic/xml_data/24HJ32GP202.xml
@@ -24,46 +24,46 @@
   <memory name="code"              start="0x000200" end="0x0057FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="1792" />
       <value value="0x02" name="768" />
       <value value="0x04" name="256" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="IOL1WAY" value="0x20" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x20" >
       <value value="0x00" name="Multiple reconfigurations" />
       <value value="0x20" name="One reconfiguration" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -145,32 +145,32 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
-    <mask name="ALTI2C" value="0x10" >
+    </tqmask>
+    <tqmask name="ALTI2C" value="0x10" >
       <value value="0x00" name="ASDA1/ASCL1" />
       <value value="0x10" name="SDA1/SCL1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ32GP204.xml b/src/devices/pic/xml_data/24HJ32GP204.xml
index 5a9e126..40d90b2 100644
--- a/src/devices/pic/xml_data/24HJ32GP204.xml
+++ b/src/devices/pic/xml_data/24HJ32GP204.xml
@@ -24,46 +24,46 @@
   <memory name="code"              start="0x000200" end="0x0057FF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="1792" />
       <value value="0x02" name="768" />
       <value value="0x04" name="256" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+  <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="IOL1WAY" value="0x20" >
+    </tqmask>
+    <tqmask name="IOL1WAY" value="0x20" >
       <value value="0x00" name="Multiple reconfigurations" />
       <value value="0x20" name="One reconfiguration" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -145,32 +145,32 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
-    <mask name="ALTI2C" value="0x10" >
+    </tqmask>
+    <tqmask name="ALTI2C" value="0x10" >
       <value value="0x00" name="ASDA1/ASCL1" />
       <value value="0x10" name="SDA1/SCL1" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP206.xml b/src/devices/pic/xml_data/24HJ64GP206.xml
index a3266fa..42b47d2 100644
--- a/src/devices/pic/xml_data/24HJ64GP206.xml
+++ b/src/devices/pic/xml_data/24HJ64GP206.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x00ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="16384" />
       <value value="0x02" name="8192"  />
       <value value="0x04" name="4096"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP210.xml b/src/devices/pic/xml_data/24HJ64GP210.xml
index 630a12a..734ce51 100644
--- a/src/devices/pic/xml_data/24HJ64GP210.xml
+++ b/src/devices/pic/xml_data/24HJ64GP210.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x00ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="16384" />
       <value value="0x02" name="8192"  />
       <value value="0x04" name="4096"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP506.xml b/src/devices/pic/xml_data/24HJ64GP506.xml
index 372c767..74a6cfa 100644
--- a/src/devices/pic/xml_data/24HJ64GP506.xml
+++ b/src/devices/pic/xml_data/24HJ64GP506.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x00ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="16384" />
       <value value="0x02" name="8192"  />
       <value value="0x04" name="4096"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP510.xml b/src/devices/pic/xml_data/24HJ64GP510.xml
index 8711793..099ab2a 100644
--- a/src/devices/pic/xml_data/24HJ64GP510.xml
+++ b/src/devices/pic/xml_data/24HJ64GP510.xml
@@ -21,72 +21,72 @@
   <memory name="code"           start="0x000200" end="0x00ABFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0xF80010" end="0xF80018" rmask="0xFF" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80018" rtqmask="0xFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x800FFF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTBS" value="0x01" >
+  <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTBS" value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="BSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x06" >
       <value value="0x00" name="8192" />
       <value value="0x02" name="4096" />
       <value value="0x04" name="1024" />
       <value value="0x06" name="0"  />
-    </mask>
-    <mask name="BSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RBSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RBSSIZ" value="0xC0" >
       <value value="0x00" name="1024" />
       <value value="0x40" name="256"  />
       <value value="0x80" name="128"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
-    <mask name="WRTSS"  value="0x01" >
+  <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+    <tqmask name="WRTSS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="SSSIZ"  value="0x06" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x06" >
       <value value="0x00" name="16384" />
       <value value="0x02" name="8192"  />
       <value value="0x04" name="4096"  />
       <value value="0x06" name="0"   />
-    </mask>
-    <mask name="SSSEC" value="0x08" >
+    </tqmask>
+    <tqmask name="SSSEC" value="0x08" >
       <value value="0x00" name="High Security"     />
       <value value="0x08" name="Standard Security" />
-    </mask>
-    <mask name="RSSSIZ" value="0xC0" >
+    </tqmask>
+    <tqmask name="RSSSIZ" value="0xC0" >
       <value value="0x00" name="4096" />
       <value value="0x40" name="2048" />
       <value value="0x80" name="256"  />
       <value value="0xC0" name="0"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
-    <mask name="WRTGS"  value="0x01" >
+  <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="WRTGS"  value="0x01" >
       <value value="0x00" name="All"  />
       <value value="0x01" name="Off" />
-    </mask>
-    <mask name="GSSEC" value="0x06" >
+    </tqmask>
+    <tqmask name="GSSEC" value="0x06" >
       <value value="0x00" name="High Security" />
       <value value="0x02" name="High Security" />
       <value value="0x04" name="Standard Security" />
       <value value="0x06" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
-    <mask name="FNOSC" value="0x07" >
+  <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+    <tqmask name="FNOSC" value="0x07" >
       <value value="0x00" name="EXTRC_F" />
       <value value="0x01" name="INTRC_F_PLL" />
       <value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
       <value value="0x05" name="EXTRC_LP" />
       <value value="0x06" name="invalid" />
       <value value="0x07" name="INTRC_F_POST" />
-    </mask>
-    <mask name="TEMP" value="0x20" >
+    </tqmask>
+    <tqmask name="TEMP" value="0x20" >
       <value value="0x00" name="On" />
       <value value="0x20" name="Off" />
-    </mask>
-    <mask name="IESO" value="0x80" >
+    </tqmask>
+    <tqmask name="IESO" value="0x80" >
       <value value="0x00" name="Off" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
-    <mask name="POSCMD" value="0x03" >
+  <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+    <tqmask name="POSCMD" value="0x03" >
       <value value="0x00" name="EC" />
       <value value="0x01" name="XT" />
       <value value="0x02" name="HS" />
       <value value="0x03" name="Off" />
-    </mask>
-    <mask name="OSCIOFNC" value="0x04" >
+    </tqmask>
+    <tqmask name="OSCIOFNC" value="0x04" >
       <value value="0x00" name="IO" />
       <value value="0x04" name="Clock" />
-    </mask>
-    <mask name="FCKSM" value="0xC0" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC0" >
       <value value="0x00" name="Switching on, monitor on" />
       <value value="0x40" name="Switching on, monitor off" />
       <value value="0x80" name="Switching off, monitor off" />
       <value value="0xC0" name="Switching off, monitor off" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
-    <mask name="WDTPOST" value="0x0F" >
+  <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+    <tqmask name="WDTPOST" value="0x0F" >
       <value value="0x00" name="1:1" />
       <value value="0x01" name="1:2" />
       <value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
       <value value="0x0D" name="1:8192" />
       <value value="0x0E" name="1:16384" />
       <value value="0x0F" name="1:32768" />
-    </mask>
-    <mask name="WDTPRE" value="0x10" >
+    </tqmask>
+    <tqmask name="WDTPRE" value="0x10" >
       <value value="0x00" name="1:32" />
       <value value="0x10" name="1:128" />
-    </mask>
-    <mask name="WINDIS" value="0x40" >
+    </tqmask>
+    <tqmask name="WINDIS" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="FWDTEN" value="0x80" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x80" >
       <value value="0x00" name="Software" />
       <value value="0x80" name="On" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
-    <mask name="FPWRT" value="0x07" >
+  <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+    <tqmask name="FPWRT" value="0x07" >
       <value value="0x00" name="0" />
       <value value="0x01" name="2" />
       <value value="0x02" name="4" />
@@ -168,28 +168,28 @@
       <value value="0x05" name="32" />
       <value value="0x06" name="64" />
       <value value="0x07" name="128" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
-    <mask name="ICS" value="0x03" >
+  <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+    <tqmask name="ICS" value="0x03" >
       <value value="0x00" name="EMUC3, EMUD3" />
       <value value="0x01" name="EMUC2, EMUD2" />
       <value value="0x02" name="EMUC1, EMUD1" />
       <value value="0x03" name="PGC/EMUC, PGD/EMUD" />
-    </mask>
-    <mask name="JTAGEN" value="0x20" >
+    </tqmask>
+    <tqmask name="JTAGEN" value="0x20" >
       <value value="0x00" name="Off" />
       <value value="0x20" name="On" />
-    </mask>
-    <mask name="COE" value="0x40" >
+    </tqmask>
+    <tqmask name="COE" value="0x40" >
       <value value="0x00" name="On" />
       <value value="0x40" name="Off" />
-    </mask>
-    <mask name="DEBUG" value="0x80" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x80" >
       <value value="0x00" name="On" />
       <value value="0x80" name="Off" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F1010.xml b/src/devices/pic/xml_data/30F1010.xml
index 1d59008..7aa7c07 100644
--- a/src/devices/pic/xml_data/30F1010.xml
+++ b/src/devices/pic/xml_data/30F1010.xml
@@ -27,77 +27,77 @@
   <memory name="code"           start="0x000000" end="0x000FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
-  <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+  <tqmask name="WRTBS" value="0x0001" >
     <value value="0x0000" name="All" />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="BSSIZ"  value="0x0006" >
+  </tqmask>
+  <tqmask name="BSSIZ"  value="0x0006" >
     <value value="0x0000" name="0"  />
     <value value="0x0002" name="invalid" />
     <value value="0x0004" name="1024" />
     <value value="0x0006" name="0"  />
-  </mask>
-  <mask name="BSSEC" value="0x0008" >
+  </tqmask>
+  <tqmask name="BSSEC" value="0x0008" >
     <value value="0x0000" name="High Security"     />
     <value value="0x0008" name="Standard Security" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
 
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="WRTGS"  value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="WRTGS"  value="0x0001" >
     <value value="0x0000" name="All"  />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="GSSEC" value="0x0006" >
+  </tqmask>
+  <tqmask name="GSSEC" value="0x0006" >
     <value value="0x0000" name="High Security" />
     <value value="0x0002" name="High Security" />
     <value value="0x0004" name="Standard Security" />
     <value value="0x0006" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
-  <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+  <tqmask name="FNOSC" value="0x0003" >
     <value value="0x0000" name="INTRC_F" />
     <value value="0x0001" name="INTRC_F_PLL" />
     <value value="0x0002" name="PRIM" />
     <value value="0x0003" name="PRIM_PLL" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
-  <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+  <tqmask name="POSCMD" value="0x0003" >
     <value value="0x0000" name="EC" />
     <value value="0x0001" name="invalid" />
     <value value="0x0002" name="HS" />
     <value value="0x0003" name="Off" />
-  </mask>
-  <mask name="OSCIOFNC" value="0x0004" >
+  </tqmask>
+  <tqmask name="OSCIOFNC" value="0x0004" >
     <value value="0x0000" name="IO" />
     <value value="0x0004" name="Clock" />
-  </mask>
-  <mask name="FRANGE" value="0x0020" >
+  </tqmask>
+  <tqmask name="FRANGE" value="0x0020" >
     <value value="0x0000" name="Low range" />
     <value value="0x0020" name="High range" />
-  </mask>
-  <mask name="FCKSM" value="0x00C0" >
+  </tqmask>
+  <tqmask name="FCKSM" value="0x00C0" >
     <value value="0x0000" name="Switching on, monitor on" />
     <value value="0x0040" name="Switching on, monitor off" />
     <value value="0x0080" name="Switching off, monitor off" />
     <value value="0x00C0" name="Switching off, monitor off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
-  <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+  <tqmask name="WDTPOST" value="0x000F" >
     <value value="0x0000" name="1:1" />
     <value value="0x0001" name="1:2" />
     <value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
     <value value="0x000D" name="1:8192" />
     <value value="0x000E" name="1:16384" />
     <value value="0x000F" name="1:32768" />
-  </mask>
-  <mask name="WDTPRE" value="0x0010" >
+  </tqmask>
+  <tqmask name="WDTPRE" value="0x0010" >
     <value value="0x0000" name="1:32" />
     <value value="0x0010" name="1:128" />
-  </mask>
-  <mask name="WINDIS" value="0x0040" >
+  </tqmask>
+  <tqmask name="WINDIS" value="0x0040" >
     <value value="0x0000" name="On" />
     <value value="0x0040" name="Off" />
-  </mask>
-  <mask name="FWDTEN" value="0x0080" >
+  </tqmask>
+  <tqmask name="FWDTEN" value="0x0080" >
     <value value="0x0000" name="Software" />
     <value value="0x0080" name="On" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="FPWRT" value="0x0007" >
     <value value="0x0000" name="0" />
     <value value="0x0001" name="2" />
     <value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
     <value value="0x0005" name="32" />
     <value value="0x0006" name="64" />
     <value value="0x0007" name="128" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
-  <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+  <tqmask name="ICS" value="0x0003" >
     <value value="0x0000" name="invalid" />
     <value value="0x0001" name="EMUC2, EMUD2" />
     <value value="0x0002" name="EMUC1, EMUD1" />
     <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
-  </mask>
-  <mask name="DEBUG" value="0x0080" >
+  </tqmask>
+  <tqmask name="DEBUG" value="0x0080" >
     <value value="0x0000" name="On" />
     <value value="0x0080" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2010.xml b/src/devices/pic/xml_data/30F2010.xml
index f252785..85ec165 100644
--- a/src/devices/pic/xml_data/30F2010.xml
+++ b/src/devices/pic/xml_data/30F2010.xml
@@ -36,13 +36,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -59,22 +59,22 @@
       <value value="0x000D" name="EC4"          cname="EC_PLL4"  />
       <value value="0x000E" name="EC8"          cname="EC_PLL8"  />
       <value value="0x000F" name="EC16"         cname="EC_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="LP"   />
       <value value="0x0100" name="INTRC_F"  cname="FRC"  />
       <value value="0x0200" name="INTRC_LP" cname="LPRC" />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -91,84 +91,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2011.xml b/src/devices/pic/xml_data/30F2011.xml
index a767855..54886ed 100644
--- a/src/devices/pic/xml_data/30F2011.xml
+++ b/src/devices/pic/xml_data/30F2011.xml
@@ -27,13 +27,13 @@
   <memory name="code"           start="0x000000" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -53,16 +53,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -79,72 +79,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2012.xml b/src/devices/pic/xml_data/30F2012.xml
index 6da9eb7..3f0d7ec 100644
--- a/src/devices/pic/xml_data/30F2012.xml
+++ b/src/devices/pic/xml_data/30F2012.xml
@@ -27,13 +27,13 @@
   <memory name="code"           start="0x000000" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -53,16 +53,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -79,72 +79,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2020.xml b/src/devices/pic/xml_data/30F2020.xml
index 3aa30e9..cad9c22 100644
--- a/src/devices/pic/xml_data/30F2020.xml
+++ b/src/devices/pic/xml_data/30F2020.xml
@@ -27,77 +27,77 @@
   <memory name="code"           start="0x000000" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
-  <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+  <tqmask name="WRTBS" value="0x0001" >
     <value value="0x0000" name="All" />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="BSSIZ"  value="0x0006" >
+  </tqmask>
+  <tqmask name="BSSIZ"  value="0x0006" >
     <value value="0x0000" name="0"  />
     <value value="0x0002" name="4096" />
     <value value="0x0004" name="1024" />
     <value value="0x0006" name="0"  />
-  </mask>
-  <mask name="BSSEC" value="0x0008" >
+  </tqmask>
+  <tqmask name="BSSEC" value="0x0008" >
     <value value="0x0000" name="High Security"     />
     <value value="0x0008" name="Standard Security" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
 
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="WRTGS"  value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="WRTGS"  value="0x0001" >
     <value value="0x0000" name="All"  />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="GSSEC" value="0x0006" >
+  </tqmask>
+  <tqmask name="GSSEC" value="0x0006" >
     <value value="0x0000" name="High Security" />
     <value value="0x0002" name="High Security" />
     <value value="0x0004" name="Standard Security" />
     <value value="0x0006" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
-  <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+  <tqmask name="FNOSC" value="0x0003" >
     <value value="0x0000" name="INTRC_F" />
     <value value="0x0001" name="INTRC_F_PLL" />
     <value value="0x0002" name="PRIM" />
     <value value="0x0003" name="PRIM_PLL" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
-  <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+  <tqmask name="POSCMD" value="0x0003" >
     <value value="0x0000" name="EC" />
     <value value="0x0001" name="invalid" />
     <value value="0x0002" name="HS" />
     <value value="0x0003" name="Off" />
-  </mask>
-  <mask name="OSCIOFNC" value="0x0004" >
+  </tqmask>
+  <tqmask name="OSCIOFNC" value="0x0004" >
     <value value="0x0000" name="IO" />
     <value value="0x0004" name="Clock" />
-  </mask>
-  <mask name="FRANGE" value="0x0020" >
+  </tqmask>
+  <tqmask name="FRANGE" value="0x0020" >
     <value value="0x0000" name="Low range" />
     <value value="0x0020" name="High range" />
-  </mask>
-  <mask name="FCKSM" value="0x00C0" >
+  </tqmask>
+  <tqmask name="FCKSM" value="0x00C0" >
     <value value="0x0000" name="Switching on, monitor on" />
     <value value="0x0040" name="Switching on, monitor off" />
     <value value="0x0080" name="Switching off, monitor off" />
     <value value="0x00C0" name="Switching off, monitor off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
-  <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+  <tqmask name="WDTPOST" value="0x000F" >
     <value value="0x0000" name="1:1" />
     <value value="0x0001" name="1:2" />
     <value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
     <value value="0x000D" name="1:8192" />
     <value value="0x000E" name="1:16384" />
     <value value="0x000F" name="1:32768" />
-  </mask>
-  <mask name="WDTPRE" value="0x0010" >
+  </tqmask>
+  <tqmask name="WDTPRE" value="0x0010" >
     <value value="0x0000" name="1:32" />
     <value value="0x0010" name="1:128" />
-  </mask>
-  <mask name="WINDIS" value="0x0040" >
+  </tqmask>
+  <tqmask name="WINDIS" value="0x0040" >
     <value value="0x0000" name="On" />
     <value value="0x0040" name="Off" />
-  </mask>
-  <mask name="FWDTEN" value="0x0080" >
+  </tqmask>
+  <tqmask name="FWDTEN" value="0x0080" >
     <value value="0x0000" name="Software" />
     <value value="0x0080" name="On" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="FPWRT" value="0x0007" >
     <value value="0x0000" name="0" />
     <value value="0x0001" name="2" />
     <value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
     <value value="0x0005" name="32" />
     <value value="0x0006" name="64" />
     <value value="0x0007" name="128" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
-  <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+  <tqmask name="ICS" value="0x0003" >
     <value value="0x0000" name="invalid" />
     <value value="0x0001" name="EMUC2, EMUD2" />
     <value value="0x0002" name="EMUC1, EMUD1" />
     <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
-  </mask>
-  <mask name="DEBUG" value="0x0080" >
+  </tqmask>
+  <tqmask name="DEBUG" value="0x0080" >
     <value value="0x0000" name="On" />
     <value value="0x0080" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2023.xml b/src/devices/pic/xml_data/30F2023.xml
index 8241600..6871678 100644
--- a/src/devices/pic/xml_data/30F2023.xml
+++ b/src/devices/pic/xml_data/30F2023.xml
@@ -27,77 +27,77 @@
   <memory name="code"           start="0x000000" end="0x001FFF" />
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000F" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
-  <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+  <tqmask name="WRTBS" value="0x0001" >
     <value value="0x0000" name="All" />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="BSSIZ"  value="0x0006" >
+  </tqmask>
+  <tqmask name="BSSIZ"  value="0x0006" >
     <value value="0x0000" name="0"  />
     <value value="0x0002" name="4096" />
     <value value="0x0004" name="1024" />
     <value value="0x0006" name="0"  />
-  </mask>
-  <mask name="BSSEC" value="0x0008" >
+  </tqmask>
+  <tqmask name="BSSEC" value="0x0008" >
     <value value="0x0000" name="High Security"     />
     <value value="0x0008" name="Standard Security" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
 
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="WRTGS"  value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="WRTGS"  value="0x0001" >
     <value value="0x0000" name="All"  />
     <value value="0x0001" name="Off" />
-  </mask>
-  <mask name="GSSEC" value="0x0006" >
+  </tqmask>
+  <tqmask name="GSSEC" value="0x0006" >
     <value value="0x0000" name="High Security" />
     <value value="0x0002" name="High Security" />
     <value value="0x0004" name="Standard Security" />
     <value value="0x0006" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
-  <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+  <tqmask name="FNOSC" value="0x0003" >
     <value value="0x0000" name="INTRC_F" />
     <value value="0x0001" name="INTRC_F_PLL" />
     <value value="0x0002" name="PRIM" />
     <value value="0x0003" name="PRIM_PLL" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
-  <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+  <tqmask name="POSCMD" value="0x0003" >
     <value value="0x0000" name="EC" />
     <value value="0x0001" name="invalid" />
     <value value="0x0002" name="HS" />
     <value value="0x0003" name="Off" />
-  </mask>
-  <mask name="OSCIOFNC" value="0x0004" >
+  </tqmask>
+  <tqmask name="OSCIOFNC" value="0x0004" >
     <value value="0x0000" name="IO" />
     <value value="0x0004" name="Clock" />
-  </mask>
-  <mask name="FRANGE" value="0x0020" >
+  </tqmask>
+  <tqmask name="FRANGE" value="0x0020" >
     <value value="0x0000" name="Low range" />
     <value value="0x0020" name="High range" />
-  </mask>
-  <mask name="FCKSM" value="0x00C0" >
+  </tqmask>
+  <tqmask name="FCKSM" value="0x00C0" >
     <value value="0x0000" name="Switching on, monitor on" />
     <value value="0x0040" name="Switching on, monitor off" />
     <value value="0x0080" name="Switching off, monitor off" />
     <value value="0x00C0" name="Switching off, monitor off" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
-  <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+  <tqmask name="WDTPOST" value="0x000F" >
     <value value="0x0000" name="1:1" />
     <value value="0x0001" name="1:2" />
     <value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
     <value value="0x000D" name="1:8192" />
     <value value="0x000E" name="1:16384" />
     <value value="0x000F" name="1:32768" />
-  </mask>
-  <mask name="WDTPRE" value="0x0010" >
+  </tqmask>
+  <tqmask name="WDTPRE" value="0x0010" >
     <value value="0x0000" name="1:32" />
     <value value="0x0010" name="1:128" />
-  </mask>
-  <mask name="WINDIS" value="0x0040" >
+  </tqmask>
+  <tqmask name="WINDIS" value="0x0040" >
     <value value="0x0000" name="On" />
     <value value="0x0040" name="Off" />
-  </mask>
-  <mask name="FWDTEN" value="0x0080" >
+  </tqmask>
+  <tqmask name="FWDTEN" value="0x0080" >
     <value value="0x0000" name="Software" />
     <value value="0x0080" name="On" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
-  <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+  <tqmask name="FPWRT" value="0x0007" >
     <value value="0x0000" name="0" />
     <value value="0x0001" name="2" />
     <value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
     <value value="0x0005" name="32" />
     <value value="0x0006" name="64" />
     <value value="0x0007" name="128" />
-  </mask>
+  </tqmask>
 </config>
 
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
-  <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+  <tqmask name="ICS" value="0x0003" >
     <value value="0x0000" name="invalid" />
     <value value="0x0001" name="EMUC2, EMUD2" />
     <value value="0x0002" name="EMUC1, EMUD1" />
     <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
-  </mask>
-  <mask name="DEBUG" value="0x0080" >
+  </tqmask>
+  <tqmask name="DEBUG" value="0x0080" >
     <value value="0x0000" name="On" />
     <value value="0x0080" name="Off" />
-  </mask>
+  </tqmask>
 </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3010.xml b/src/devices/pic/xml_data/30F3010.xml
index 1041c86..2d4170d 100644
--- a/src/devices/pic/xml_data/30F3010.xml
+++ b/src/devices/pic/xml_data/30F3010.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,16 +54,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -80,84 +80,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3011.xml b/src/devices/pic/xml_data/30F3011.xml
index b092d8b..6f84490 100644
--- a/src/devices/pic/xml_data/30F3011.xml
+++ b/src/devices/pic/xml_data/30F3011.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"         />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,84 +81,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3012.xml b/src/devices/pic/xml_data/30F3012.xml
index b87d96a..4ecc5d3 100644
--- a/src/devices/pic/xml_data/30F3012.xml
+++ b/src/devices/pic/xml_data/30F3012.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"         />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,16 +54,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -80,72 +80,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3013.xml b/src/devices/pic/xml_data/30F3013.xml
index 702e415..337316c 100644
--- a/src/devices/pic/xml_data/30F3013.xml
+++ b/src/devices/pic/xml_data/30F3013.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"         />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,16 +54,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -80,72 +80,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3014.xml b/src/devices/pic/xml_data/30F3014.xml
index 13bd387..870b30b 100644
--- a/src/devices/pic/xml_data/30F3014.xml
+++ b/src/devices/pic/xml_data/30F3014.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,16 +54,16 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -80,72 +80,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4011.xml b/src/devices/pic/xml_data/30F4011.xml
index 89791c2..91f6d83 100644
--- a/src/devices/pic/xml_data/30F4011.xml
+++ b/src/devices/pic/xml_data/30F4011.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"      />
       <value value="0x0001" name="XTL"          cname="XTL"      />
       <value value="0x0002" name="HS"           cname="HS"       />
@@ -51,23 +51,23 @@
       <value value="0x000D" name="EC4"          cname="EC_PLL4"  />
       <value value="0x000E" name="EC8"          cname="EC_PLL8"  />
       <value value="0x000F" name="EC16"         cname="EC_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -84,84 +84,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4012.xml b/src/devices/pic/xml_data/30F4012.xml
index e42b34c..3bc430b 100644
--- a/src/devices/pic/xml_data/30F4012.xml
+++ b/src/devices/pic/xml_data/30F4012.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"      />
       <value value="0x0001" name="XTL"          cname="XTL"      />
       <value value="0x0002" name="HS"           cname="HS"       />
@@ -51,23 +51,23 @@
       <value value="0x000D" name="EC4"          cname="EC_PLL4"  />
       <value value="0x000E" name="EC8"          cname="EC_PLL8"  />
       <value value="0x000F" name="EC16"         cname="EC_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -84,84 +84,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4013.xml b/src/devices/pic/xml_data/30F4013.xml
index 1732e6e..6177a81 100644
--- a/src/devices/pic/xml_data/30F4013.xml
+++ b/src/devices/pic/xml_data/30F4013.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,72 +81,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5011.xml b/src/devices/pic/xml_data/30F5011.xml
index a1f311d..dfd9f6f 100644
--- a/src/devices/pic/xml_data/30F5011.xml
+++ b/src/devices/pic/xml_data/30F5011.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"      />
       <value value="0x0001" name="XTL"          cname="XTL"      />
       <value value="0x0002" name="HS"           cname="HS"       />
@@ -51,23 +51,23 @@
       <value value="0x000D" name="EC4"          cname="EC_PLL4"  />
       <value value="0x000E" name="EC8"          cname="EC_PLL8"  />
       <value value="0x000F" name="EC16"         cname="EC_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -84,125 +84,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4196" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="512" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="512" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="256" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="768" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5013.xml b/src/devices/pic/xml_data/30F5013.xml
index debd97f..2017b70 100644
--- a/src/devices/pic/xml_data/30F5013.xml
+++ b/src/devices/pic/xml_data/30F5013.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"      />
       <value value="0x0001" name="XTL"          cname="XTL"      />
       <value value="0x0002" name="HS"           cname="HS"       />
@@ -51,23 +51,23 @@
       <value value="0x000D" name="EC4"          cname="EC_PLL4"  />
       <value value="0x000E" name="EC8"          cname="EC_PLL8"  />
       <value value="0x000F" name="EC16"         cname="EC_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -84,125 +84,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512" cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="512" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192" cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="512" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="256" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="768" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5015.xml b/src/devices/pic/xml_data/30F5015.xml
index af7c20a..489bed2 100644
--- a/src/devices/pic/xml_data/30F5015.xml
+++ b/src/devices/pic/xml_data/30F5015.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,84 +81,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5016.xml b/src/devices/pic/xml_data/30F5016.xml
index aa2e7e1..6aa3e0e 100644
--- a/src/devices/pic/xml_data/30F5016.xml
+++ b/src/devices/pic/xml_data/30F5016.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FFC00" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,84 +81,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6010.xml b/src/devices/pic/xml_data/30F6010.xml
index 8b26c7c..1038327 100644
--- a/src/devices/pic/xml_data/30F6010.xml
+++ b/src/devices/pic/xml_data/30F6010.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,84 +85,84 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IO"     />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6010A.xml b/src/devices/pic/xml_data/30F6010A.xml
index 2f5e976..4f477d2 100644
--- a/src/devices/pic/xml_data/30F6010A.xml
+++ b/src/devices/pic/xml_data/30F6010A.xml
@@ -35,13 +35,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" cmask="0xC10F">
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" ctqmask="0xC10F">
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -61,17 +61,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -88,137 +88,137 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6011.xml b/src/devices/pic/xml_data/30F6011.xml
index 60e6f5f..94a1ba1 100644
--- a/src/devices/pic/xml_data/30F6011.xml
+++ b/src/devices/pic/xml_data/30F6011.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF800" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x8005BF" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,72 +85,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6011A.xml b/src/devices/pic/xml_data/30F6011A.xml
index bb499b1..752f62b 100644
--- a/src/devices/pic/xml_data/30F6011A.xml
+++ b/src/devices/pic/xml_data/30F6011A.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF800" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,125 +81,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6012.xml b/src/devices/pic/xml_data/30F6012.xml
index e7c1797..7d5f9b5 100644
--- a/src/devices/pic/xml_data/30F6012.xml
+++ b/src/devices/pic/xml_data/30F6012.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,72 +85,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6012A.xml b/src/devices/pic/xml_data/30F6012A.xml
index 6dd84fb..c2a0e42 100644
--- a/src/devices/pic/xml_data/30F6012A.xml
+++ b/src/devices/pic/xml_data/30F6012A.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,125 +81,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6013.xml b/src/devices/pic/xml_data/30F6013.xml
index 34b66cf..81451a6 100644
--- a/src/devices/pic/xml_data/30F6013.xml
+++ b/src/devices/pic/xml_data/30F6013.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF800" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,72 +85,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6013A.xml b/src/devices/pic/xml_data/30F6013A.xml
index e0a5758..ff382ea 100644
--- a/src/devices/pic/xml_data/30F6013A.xml
+++ b/src/devices/pic/xml_data/30F6013A.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF800" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,125 +81,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6014.xml b/src/devices/pic/xml_data/30F6014.xml
index 8cf7766..2e5353e 100644
--- a/src/devices/pic/xml_data/30F6014.xml
+++ b/src/devices/pic/xml_data/30F6014.xml
@@ -29,13 +29,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
-    <mask name="FPR"   value="0x000F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+    <tqmask name="FPR"   value="0x000F" >
       <value value="0x0000" name="XTL"          cname="XTL"        />
       <value value="0x0001" name="XTL"          cname="XTL"        />
       <value value="0x0002" name="HS"           cname="HS"         />
@@ -52,23 +52,23 @@
       <value value="0x000D" name="EC4"          cname="ECIO_PLL4"  />
       <value value="0x000E" name="EC8"          cname="ECIO_PLL8"  />
       <value value="0x000F" name="EC16"         cname="ECIO_PLL16" />
-    </mask>
-    <mask name="FOS"   value="0x0300" >
+    </tqmask>
+    <tqmask name="FOS"   value="0x0300" >
       <value value="0x0000" name="TMR1"     cname="EXT" />
       <value value="0x0100" name="INTRC_F"  cname="FRC" />
       <value value="0x0200" name="INTRC_LP" cname="LP"  />
       <value value="0x0300" name="PRIM"     cname="_"    />
-    </mask>
-    <mask name="FCKSM" value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM" value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -85,72 +85,72 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+  <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
 
-  <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+  <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
 
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
-    <mask name="GWRP" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+    <tqmask name="GWRP" value="0x0001" >
       <value value="0x0000" name="All" cname="0xFFFE" />
       <value value="0x0001" name="Off" cname="_" />
-    </mask>
-    <mask name="GCP"  value="0x0002" >
+    </tqmask>
+    <tqmask name="GCP"  value="0x0002" >
       <value value="0x0000" name="All" cname="CODE_PROT_ON"  />
       <value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6014A.xml b/src/devices/pic/xml_data/30F6014A.xml
index c6a6efe..6396aed 100644
--- a/src/devices/pic/xml_data/30F6014A.xml
+++ b/src/devices/pic/xml_data/30F6014A.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,125 +81,125 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
-    <mask name="FPWRT" value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+    <tqmask name="FPWRT" value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"  value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"  value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN" value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN" value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="MCLRE" value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE" value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6015.xml b/src/devices/pic/xml_data/30F6015.xml
index 784f38d..4b5b5bd 100644
--- a/src/devices/pic/xml_data/30F6015.xml
+++ b/src/devices/pic/xml_data/30F6015.xml
@@ -28,13 +28,13 @@
   <memory name="device_id"         start="0xFF0000" end="0xFF0004" />
   <memory name="config"            start="0xF80000" end="0xF8000D" />
   <memory name="eeprom"            start="0x7FF000" end="0x7FFFFF" />
-  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+  <memory name="user_ids"          start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
   <memory name="debug_vector"      start="0x800000" end="0x800007" />
   <memory name="program_executive" start="0x800000" end="0x80053F" />
 
 <!--* Configuration bits ***************************************************-->
-  <config offset="0x0" name="FOSC"      wmask="0xC71F" bvalue="0xC71F" >
-    <mask name="FOSFPR" value="0x071F" >
+  <config offset="0x0" name="FOSC"      wtqmask="0xC71F" bvalue="0xC71F" >
+    <tqmask name="FOSFPR" value="0x071F" >
       <value value="default" name="invalid" />
       <value value="0x001F" name="TMR1"         cname="LP"        />
       <value value="0x011F" name="INTRC_F"      cname="FRC"        />
@@ -54,17 +54,17 @@
       <value value="0x0715" name="HS3_4"        cname="HS3_PLL4"   />
       <value value="0x0716" name="HS3_8"        cname="HS3_PLL8"   />
       <value value="0x0717" name="HS3_16"       cname="HS3_PLL16"  />
-    </mask>
-    <mask name="FCKSM"  value="0xC000" >
+    </tqmask>
+    <tqmask name="FCKSM"  value="0xC000" >
       <value value="0x0000" name="Switching on, monitor on"   cname="CSW_FSCM_ON"     />
       <value value="0x4000" name="Switching on, monitor off"  cname="CSW_ON_FSCM_OFF" />
       <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
       <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF"    />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x2" name="FWDT"      wmask="0x803F" bvalue="0x803F" >
-    <mask name="FWPSB"  value="0x000F" >
+  <config offset="0x2" name="FWDT"      wtqmask="0x803F" bvalue="0x803F" >
+    <tqmask name="FWPSB"  value="0x000F" >
       <value value="0x0000" name="1:1"  cname="WDTPSB_1"  />
       <value value="0x0001" name="1:2"  cname="WDTPSB_2"  />
       <value value="0x0002" name="1:3"  cname="WDTPSB_3"  />
@@ -81,137 +81,137 @@
       <value value="0x000D" name="1:14" cname="WDTPSB_14" />
       <value value="0x000E" name="1:15" cname="WDTPSB_15" />
       <value value="0x000F" name="1:16" cname="WDTPSB_16" />
-    </mask>
-    <mask name="FWPSA"  value="0x0030" >
+    </tqmask>
+    <tqmask name="FWPSA"  value="0x0030" >
       <value value="0x0000" name="1:1"   cname="WDTPSA_1"   />
       <value value="0x0010" name="1:8"   cname="WDTPSA_8"   />
       <value value="0x0020" name="1:64"  cname="WDTPSA_64"  />
       <value value="0x0030" name="1:512" cname="WDTPSA_512" />
-    </mask>
-    <mask name="FWDTEN" value="0x8000" >
+    </tqmask>
+    <tqmask name="FWDTEN" value="0x8000" >
       <value value="0x0000" name="Off" cname="WDT_OFF" />
       <value value="0x8000" name="On"  cname="WDT_ON"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x4" name="FBORPOR"   wmask="0x87B3" bvalue="0x87B3" >
-    <mask name="FPWRT"  value="0x0003" >
+  <config offset="0x4" name="FBORPOR"   wtqmask="0x87B3" bvalue="0x87B3" >
+    <tqmask name="FPWRT"  value="0x0003" >
       <value value="0x0000" name="0"  cname="PWRT_OFF" />
       <value value="0x0001" name="4"  cname="PWRT_4"   />
       <value value="0x0002" name="16" cname="PWRT_16"  />
       <value value="0x0003" name="64" cname="PWRT_64"  />
-    </mask>
-    <mask name="BORV"   value="0x0030" >
+    </tqmask>
+    <tqmask name="BORV"   value="0x0030" >
       <value value="0x0000" name="4.5" cname="BORV_45" />
       <value value="0x0010" name="4.2" cname="BORV_42" />
       <value value="0x0020" name="2.7" cname="BORV_27" />
       <value value="0x0030" name="2.0" cname="BORV_20" />
-    </mask>
-    <mask name="BODEN"  value="0x0080" >
+    </tqmask>
+    <tqmask name="BODEN"  value="0x0080" >
       <value value="0x0000" name="Off" cname="PBOR_OFF" />
       <value value="0x0080" name="On"  cname="PBOR_ON"  />
-    </mask>
-    <mask name="LPOL"   value="0x0100" >
+    </tqmask>
+    <tqmask name="LPOL"   value="0x0100" >
       <value value="0x0000" name="low"  cname="PWMxL_ACT_LO" />
       <value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
-    </mask>
-    <mask name="HPOL"   value="0x0200" >
+    </tqmask>
+    <tqmask name="HPOL"   value="0x0200" >
       <value value="0x0000" name="low"  cname="PWMxH_ACT_LO" />
       <value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
-    </mask>
-    <mask name="PWMPIN" value="0x0400" >
+    </tqmask>
+    <tqmask name="PWMPIN" value="0x0400" >
       <value value="0x0000" name="On"  cname="RST_PWMPIN" />
       <value value="0x0400" name="Off" cname="RST_IOPIN"  />
-    </mask>
-    <mask name="MCLRE"  value="0x8000" >
+    </tqmask>
+    <tqmask name="MCLRE"  value="0x8000" >
       <value value="0x0000" name="Internal" cname="MCLR_DIS" />
       <value value="0x8000" name="External" cname="MCLR_EN"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0x6" name="FBS"       wmask="0x310F" bvalue="0x310F" >
-    <mask name="WRTBS" value="0x0001" >
+  <config offset="0x6" name="FBS"       wtqmask="0x310F" bvalue="0x310F" >
+    <tqmask name="WRTBS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
-    </mask>
-    <mask name="BSSEC" value="0x0008" >
+    </tqmask>
+    <tqmask name="BSSEC" value="0x0008" >
       <value value="0x0000" name="High Security"     cname="" />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="BSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="BSSIZ"  value="0x0006" >
       <value value="0x0000" name="4096" cname=""  />
       <value value="0x0002" name="2048" cname="" />
       <value value="0x0004" name="512"  cname="" />
       <value value="0x0006" name="0"    cname="" />
-    </mask>
-    <mask name="EBSSIZ" value="0x0100" >
+    </tqmask>
+    <tqmask name="EBSSIZ" value="0x0100" >
       <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
       <value value="0x0100" name="0"   cname="NO_BOOT_EEPROM" />
-    </mask>
-    <mask name="RBSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RBSSIZ"  value="0x3000" >
       <value value="0x0000" name="1024" cname="LAR_BOOT_RAM"  />
       <value value="0x1000" name="256" cname="MED_BOOT_RAM" />
       <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
       <value value="0x3000" name="0"   cname="NO_BOOT_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0x8" name="FSS"       wmask="0x330F" bvalue="0x330F" >
-    <mask name="WRTSS" value="0x0001" >
+  <config offset="0x8" name="FSS"       wtqmask="0x330F" bvalue="0x330F" >
+    <tqmask name="WRTSS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
-    </mask>
-    <mask name="SSSEC"  value="0x0008" >
+    </tqmask>
+    <tqmask name="SSSEC"  value="0x0008" >
       <value value="0x0000" name="High Security"     cname=""  />
       <value value="0x0008" name="Standard Security" cname="" />
-    </mask>
-    <mask name="SSSIZ"  value="0x0006" >
+    </tqmask>
+    <tqmask name="SSSIZ"  value="0x0006" >
       <value value="0x0000" name="16384" cname=""  />
       <value value="0x0002" name="8192"  cname="" />
       <value value="0x0004" name="4096"  cname="" />
       <value value="0x0006" name="0"     cname="" />
-    </mask>
-    <mask name="ESSSIZ" value="0x0300" >
+    </tqmask>
+    <tqmask name="ESSSIZ" value="0x0300" >
       <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
       <value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
       <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
       <value value="0x0300" name="0"   cname="NO_SEC_EEPROM" />
-    </mask>
-    <mask name="RSSSIZ"  value="0x3000" >
+    </tqmask>
+    <tqmask name="RSSSIZ"  value="0x3000" >
       <value value="0x0000" name="4096" cname="LAR_SEC_RAM"  />
       <value value="0x1000" name="2048" cname="MED_SEC_RAM" />
       <value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
       <value value="0x3000" name="0"   cname="NO_SEC_RAM" />
-    </mask>
+    </tqmask>
   </config>
   
-  <config offset="0xA" name="FGS"       wmask="0x0007" bvalue="0x0007" >
-    <mask name="WRTGS" value="0x0001" >
+  <config offset="0xA" name="FGS"       wtqmask="0x0007" bvalue="0x0007" >
+    <tqmask name="WRTGS" value="0x0001" >
       <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
       <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
-    </mask>
-    <mask name="GSSEC"  value="0x0006" >
+    </tqmask>
+    <tqmask name="GSSEC"  value="0x0006" >
       <value value="default" name="High Security"     cname="HIGH_PROT"  />
       <value value="0x0004" name="Standard Security" cname="STAND_PROT" />
       <value value="0x0006" name="Off"               cname="GEN_PROT"  />
-    </mask>
+    </tqmask>
   </config>
 
-  <config offset="0xC" name="ICD"       wmask="0xC003" bvalue="0xC003" >
-    <mask name="ICS"   value="0x0003" >
+  <config offset="0xC" name="ICD"       wtqmask="0xC003" bvalue="0xC003" >
+    <tqmask name="ICS"   value="0x0003" >
       <value value="0x0000" name="EMUC3, EMUD3"       cname="0xFFFC" />
       <value value="0x0001" name="EMUC2, EMUD2"       cname="0xFFFD" />
       <value value="0x0002" name="EMUC1, EMUD1"       cname="0xFFFE" />
       <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
-    </mask>
-    <mask name="COE"   value="0x4000" >
+    </tqmask>
+    <tqmask name="COE"   value="0x4000" >
       <value value="0x0000" name="On"  cname="0xBFFF" />
       <value value="0x4000" name="Off" cname="_" />
-    </mask>
-    <mask name="DEBUG" value="0x8000" >
+    </tqmask>
+    <tqmask name="DEBUG" value="0x8000" >
       <value value="0x0000" name="On"  cname="0x7FFF" />
       <value value="0x8000" name="Off" cname="_" />
-    </mask>
+    </tqmask>
   </config>
 
 <!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/pic.xsd b/src/devices/pic/xml_data/pic.xsd
index f358f68..52d1bb2 100644
--- a/src/devices/pic/xml_data/pic.xsd
+++ b/src/devices/pic/xml_data/pic.xsd
@@ -225,9 +225,9 @@
     <xs:attribute name="name"           type="memory_type"   use="required"/>
     <xs:attribute name="start"          type="hex"           use="required"/>
     <xs:attribute name="end"            type="hex"           use="required"/>
-    <xs:attribute name="cal_opmask"     type="hex"                         />
+    <xs:attribute name="cal_optqmask"     type="hex"                         />
     <xs:attribute name="cal_opcode"     type="hex"                         />
-    <xs:attribute name="rmask"          type="hex"                         />
+    <xs:attribute name="rtqmask"          type="hex"                         />
     <xs:attribute name="hexfile_offset" type="hexfile_offset"              />
   </xs:complexType>
 
@@ -246,14 +246,14 @@
   </xs:complexType>
   <xs:complexType name="ConfigType">
     <xs:sequence>
-      <xs:element name="mask" type="MaskType" maxOccurs="unbounded"/>
+      <xs:element name="tqmask" type="MaskType" maxOccurs="unbounded"/>
     </xs:sequence>
     <xs:attribute name="name"    type="xs:string" use="required"/>
     <xs:attribute name="offset"  type="hex"       use="required"/>
-    <xs:attribute name="wmask"   type="hex"       use="required"/>
+    <xs:attribute name="wtqmask"   type="hex"       use="required"/>
     <xs:attribute name="bvalue"  type="hex"       use="required"/>
-    <xs:attribute name="cmask"   type="hex"                     />
-    <xs:attribute name="pmask"   type="hex"                     />
+    <xs:attribute name="ctqmask"   type="hex"                     />
+    <xs:attribute name="ptqmask"   type="hex"                     />
     <xs:attribute name="icnames" type="cnames"                  />
   </xs:complexType>
 
diff --git a/src/devices/pic/xml_data/registers/registers.xml b/src/devices/pic/xml_data/registers/registers.xml
index d7c0884..509e4ff 100644
--- a/src/devices/pic/xml_data/registers/registers.xml
+++ b/src/devices/pic/xml_data/registers/registers.xml
@@ -20769,7 +20769,7 @@
     <sfr address="0x0018" access="11111111" name="PRODL" mclr="33333333" por="00000000" />
     <sfr address="0x0019" access="11111111" name="PRODH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -20885,7 +20885,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -21001,7 +21001,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -21123,7 +21123,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -21245,7 +21245,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F91" start="0x0F90" />
@@ -21376,7 +21376,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F2F" start="0x0F2F" />
     <unused end="0x0F3F" start="0x0F3F" />
     <unused end="0x0F4F" start="0x0F4F" />
@@ -21628,7 +21628,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F9B" start="0x0F9B" />
     <unused end="0x0FA5" start="0x0FA3" />
@@ -21763,7 +21763,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F2F" start="0x0F2F" />
     <unused end="0x0F3F" start="0x0F3F" />
     <unused end="0x0F4F" start="0x0F4F" />
@@ -22021,7 +22021,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_mask="0x7FFE" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_tqmask="0x7FFE" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F82" />
     <unused end="0x0F91" start="0x0F8B" />
@@ -22135,7 +22135,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_mask="0x7FFE" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_tqmask="0x7FFE" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0FBF" start="0x0FBA" />
     <unused end="0x0FCC" start="0x0FC5" />
@@ -22254,7 +22254,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_mask="0x7FFE" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_tqmask="0x7FFE" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F82" />
     <unused end="0x0F91" start="0x0F8B" />
@@ -22368,7 +22368,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_mask="0x7FFE" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_tqmask="0x7FFE" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0FBF" start="0x0FBA" />
     <unused end="0x0FCC" start="0x0FC5" />
@@ -22487,7 +22487,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
@@ -22612,7 +22612,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -22740,7 +22740,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
@@ -22865,7 +22865,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -22993,7 +22993,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F86" start="0x0F84" />
     <unused end="0x0F8F" start="0x0F8E" />
@@ -23163,7 +23163,7 @@
     <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
     <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -23286,7 +23286,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -23406,7 +23406,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -23534,7 +23534,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -23662,7 +23662,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F86" start="0x0F84" />
     <unused end="0x0F8F" start="0x0F8E" />
@@ -23832,7 +23832,7 @@
     <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
     <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -23944,7 +23944,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_mask="0x7FEC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_tqmask="0x7FEC" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -24078,7 +24078,7 @@
     <sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" />
     <sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F83" start="0x0F83" />
@@ -24241,7 +24241,7 @@
     <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
     <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_tqmask="0x7FF8" >
     <mirror>
       <range end="0x0F2E" start="0x0F2E" />
       <range end="0x0F3E" start="0x0F3E" />
@@ -24484,7 +24484,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_mask="0x1FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_tqmask="0x1FF8" >
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
     <unused end="0x0D8F" start="0x0D8C" />
@@ -24902,7 +24902,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -25025,7 +25025,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
@@ -25153,7 +25153,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_tqmask="0x0000" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -25276,7 +25276,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -25396,7 +25396,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F8D" start="0x0F8C" />
@@ -25526,7 +25526,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F8D" start="0x0F8C" />
@@ -25656,7 +25656,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_tqmask="0x0000" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -25784,7 +25784,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F83" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -25896,7 +25896,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F83" start="0x0F83" />
@@ -26059,7 +26059,7 @@
     <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
     <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_tqmask="0x7FC0" >
     <mirror>
       <range end="0x0F2E" start="0x0F2E" />
       <range end="0x0F3E" start="0x0F3E" />
@@ -26302,7 +26302,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_mask="0x1FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_tqmask="0x1FC0" >
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
     <unused end="0x0D8F" start="0x0D8C" />
@@ -26720,7 +26720,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -27133,7 +27133,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -27256,7 +27256,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_tqmask="0x0000" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -27379,7 +27379,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_tqmask="0x0000" >
     <unused end="0x0F83" start="0x0F83" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8C" />
@@ -27507,7 +27507,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -27920,7 +27920,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -28333,7 +28333,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -28746,7 +28746,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -28878,7 +28878,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -29012,7 +29012,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -29144,7 +29144,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_mask="0x7FFC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_tqmask="0x7FFC" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -29278,7 +29278,7 @@
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
     <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F86" start="0x0F85" />
     <unused end="0x0F8F" start="0x0F8E" />
@@ -29454,7 +29454,7 @@
     <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
     <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -29582,7 +29582,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -29708,7 +29708,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -29840,7 +29840,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -29972,7 +29972,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F86" start="0x0F85" />
     <unused end="0x0F8F" start="0x0F8E" />
@@ -30148,7 +30148,7 @@
     <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
     <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -30266,7 +30266,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_mask="0x7FEC" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_tqmask="0x7FEC" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -30406,7 +30406,7 @@
     <sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" />
     <sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F88" start="0x0F85" />
@@ -30571,7 +30571,7 @@
     <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
     <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_tqmask="0x7FF8" >
     <mirror>
       <range end="0x0F2E" start="0x0F2E" />
       <range end="0x0F3E" start="0x0F3E" />
@@ -30828,7 +30828,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_mask="0x1FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_tqmask="0x1FF8" >
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
     <unused end="0x0D8F" start="0x0D8C" />
@@ -31260,7 +31260,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F91" start="0x0F8F" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -31393,7 +31393,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -31523,7 +31523,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_tqmask="0x0000" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -31650,7 +31650,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -31776,7 +31776,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -31908,7 +31908,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -32040,7 +32040,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_tqmask="0x0000" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -32172,7 +32172,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_tqmask="0x7FC0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
@@ -32290,7 +32290,7 @@
     <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F88" start="0x0F85" />
@@ -32455,7 +32455,7 @@
     <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
     <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_mask="0x7FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_tqmask="0x7FC0" >
     <mirror>
       <range end="0x0F2E" start="0x0F2E" />
       <range end="0x0F3E" start="0x0F3E" />
@@ -32712,7 +32712,7 @@
     <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_mask="0x1FC0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_tqmask="0x1FC0" >
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
     <unused end="0x0D8F" start="0x0D8C" />
@@ -33144,7 +33144,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -33568,7 +33568,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0F7F" start="0x0F00" />
     <unused end="0x0F91" start="0x0F8F" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -33701,7 +33701,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_tqmask="0x0000" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -33828,7 +33828,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_tqmask="0x0000" >
     <unused end="0x0F88" start="0x0F85" />
     <unused end="0x0F91" start="0x0F8E" />
     <unused end="0x0F9A" start="0x0F97" />
@@ -33960,7 +33960,7 @@
     <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
     <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -34384,7 +34384,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -34808,7 +34808,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_tqmask="0x0000" >
     <unused end="0x0D59" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -35232,7 +35232,7 @@
     <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F6A" start="0x0F40" />
     <unused end="0x0F7C" start="0x0F70" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -35379,7 +35379,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F57" start="0x0F40" />
     <unused end="0x0F5F" start="0x0F5E" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -35552,7 +35552,7 @@
     <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
     <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -35689,7 +35689,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -35857,7 +35857,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7C" start="0x0F70" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -36004,7 +36004,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F57" start="0x0F40" />
     <unused end="0x0F5F" start="0x0F5E" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -36177,7 +36177,7 @@
     <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
     <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -36314,7 +36314,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -36482,7 +36482,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F88" start="0x0F87" />
@@ -36641,7 +36641,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_tqmask="0x0000" >
     <unused end="0x0F66" start="0x0F00" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -36807,7 +36807,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -36981,7 +36981,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_tqmask="0x0000" >
     <unused end="0x0D5F" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -37409,7 +37409,7 @@
     <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -37581,7 +37581,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_tqmask="0x7F00" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -37718,7 +37718,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -37890,7 +37890,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -38076,7 +38076,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_tqmask="0x7F00" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0F88" start="0x0F87" />
     <unused end="0x0F9A" start="0x0F99" />
@@ -38244,7 +38244,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_tqmask="0x0000" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F88" start="0x0F87" />
@@ -38403,7 +38403,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_tqmask="0x0000" >
     <unused end="0x0F66" start="0x0F00" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -38569,7 +38569,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -38743,7 +38743,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -38917,7 +38917,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_tqmask="0x0000" >
     <unused end="0x0D5F" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -39345,7 +39345,7 @@
     <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -39517,7 +39517,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -39704,7 +39704,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0FAA" start="0x0FA8" />
@@ -39875,7 +39875,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40062,7 +40062,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40249,7 +40249,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40436,7 +40436,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -40689,7 +40689,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -40942,7 +40942,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_tqmask="0x0000" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F88" start="0x0F87" />
@@ -41101,7 +41101,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -41275,7 +41275,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F88" start="0x0F87" />
@@ -41446,7 +41446,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -41633,7 +41633,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -41820,7 +41820,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -42073,7 +42073,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F57" start="0x0F00" />
     <unused end="0x0F7C" start="0x0F70" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -42223,7 +42223,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F57" start="0x0F40" />
     <unused end="0x0F7D" start="0x0F7D" />
     <unused end="0x0FAA" start="0x0FA6" />
@@ -42400,7 +42400,7 @@
     <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
     <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FBF" start="0x0F6B" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -42540,7 +42540,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FB0" start="0x0FB0" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -42711,7 +42711,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7C" start="0x0F70" />
     <unused end="0x0F7D" start="0x0F7D" />
@@ -42861,7 +42861,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_mask="0x7FF8" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_tqmask="0x7FF8" >
     <unused end="0x0F57" start="0x0F40" />
     <unused end="0x0F7D" start="0x0F7D" />
     <unused end="0x0FAA" start="0x0FA6" />
@@ -43038,7 +43038,7 @@
     <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
     <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FBF" start="0x0F6B" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -43178,7 +43178,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_mask="0x7FF0" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_tqmask="0x7FF0" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FB0" start="0x0FB0" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -43349,7 +43349,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F9B" start="0x0F9B" />
@@ -43511,7 +43511,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_tqmask="0x0000" >
     <unused end="0x0F66" start="0x0F00" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9B" start="0x0F9B" />
@@ -43682,7 +43682,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9C" start="0x0F9C" />
@@ -43859,7 +43859,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_tqmask="0x0000" >
     <unused end="0x0D5F" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -44292,7 +44292,7 @@
     <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -44467,7 +44467,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_tqmask="0x7F00" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FBF" start="0x0F6B" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -44607,7 +44607,7 @@
     <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -44782,7 +44782,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -44975,7 +44975,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_tqmask="0x7F00" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FB0" start="0x0FB0" />
     <combined address="0x0FFD" size="3" name="TOS" />
@@ -45147,7 +45147,7 @@
     <sfr address="0x0F6C" access="33333333" name="LCDDATA6" mclr="33333333" por="00000000" />
     <sfr address="0x0F6B" access="33333333" name="LCDDATA5" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_tqmask="0x0000" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F9B" start="0x0F9B" />
@@ -45309,7 +45309,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_tqmask="0x0000" >
     <unused end="0x0F66" start="0x0F00" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9B" start="0x0F9B" />
@@ -45480,7 +45480,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9C" start="0x0F9C" />
@@ -45657,7 +45657,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9C" start="0x0F9C" />
@@ -45834,7 +45834,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_tqmask="0x0000" >
     <unused end="0x0D5F" start="0x0D00" />
     <unused end="0x0D6F" start="0x0D6C" />
     <unused end="0x0D7F" start="0x0D7C" />
@@ -46267,7 +46267,7 @@
     <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
     <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_mask="0x7F00" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_tqmask="0x7F00" >
     <unused end="0x0F5F" start="0x0F00" />
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
@@ -46442,7 +46442,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -46635,7 +46635,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0FAA" start="0x0FA8" />
@@ -46809,7 +46809,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47002,7 +47002,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47195,7 +47195,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47388,7 +47388,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -47649,7 +47649,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -47910,7 +47910,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_tqmask="0x0000" >
     <unused end="0x0F6A" start="0x0F00" />
     <unused end="0x0F7F" start="0x0F79" />
     <unused end="0x0F9B" start="0x0F9B" />
@@ -48072,7 +48072,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0F9C" start="0x0F9C" />
@@ -48249,7 +48249,7 @@
     <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_tqmask="0x0000" >
     <unused end="0x0F61" start="0x0F60" />
     <unused end="0x0F7B" start="0x0F7A" />
     <unused end="0x0FAA" start="0x0FA8" />
@@ -48423,7 +48423,7 @@
     <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
     <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -48616,7 +48616,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_tqmask="0x0000" >
     <unused end="0x0F59" start="0x0F40" />
     <combined address="0x0FFD" size="3" name="TOS" />
     <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -48809,7 +48809,7 @@
     <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
     <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -49070,7 +49070,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -49335,7 +49335,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />
@@ -49600,7 +49600,7 @@
     <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
     <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
   </device>
-  <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_mask="0x0000" >
+  <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_tqmask="0x0000" >
     <unused end="0x0FD4" start="0x0FD4" />
     <unused end="0x0FAA" start="0x0FA8" />
     <unused end="0x0EFF" start="0x0EFF" />