diff --git a/src/nt/ntaggregate.cpp b/src/nt/ntaggregate.cpp
index 4f9e4a1..6584487 100644
--- a/src/nt/ntaggregate.cpp
+++ b/src/nt/ntaggregate.cpp
@@ -171,15 +171,15 @@ NTAggregateBuilder::shared_pointer NTAggregateBuilder::add(string const & name,
 
 const std::string NTAggregate::URI("epics:nt/NTAggregate:1.0");
 
-NTAggregate::shared_pointer NTAggregate::wrap(PVStructurePtr const & structure)
+NTAggregate::shared_pointer NTAggregate::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTAggregate::shared_pointer NTAggregate::wrapUnsafe(PVStructurePtr const & structure)
+NTAggregate::shared_pointer NTAggregate::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTAggregate(structure));
+    return shared_pointer(new NTAggregate(pvStructure));
 }
 
 bool NTAggregate::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntattribute.cpp b/src/nt/ntattribute.cpp
index 895ae94..2198315 100644
--- a/src/nt/ntattribute.cpp
+++ b/src/nt/ntattribute.cpp
@@ -108,15 +108,15 @@ NTAttributeBuilder::shared_pointer NTAttributeBuilder::add(string const & name,
 
 const std::string NTAttribute::URI("epics:nt/NTAttribute:1.0");
 
-NTAttribute::shared_pointer NTAttribute::wrap(PVStructurePtr const & structure)
+NTAttribute::shared_pointer NTAttribute::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTAttribute::shared_pointer NTAttribute::wrapUnsafe(PVStructurePtr const & structure)
+NTAttribute::shared_pointer NTAttribute::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTAttribute(structure));
+    return shared_pointer(new NTAttribute(pvStructure));
 }
 
 bool NTAttribute::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntcontinuum.cpp b/src/nt/ntcontinuum.cpp
index a0ac9f4..d3586c3 100644
--- a/src/nt/ntcontinuum.cpp
+++ b/src/nt/ntcontinuum.cpp
@@ -100,15 +100,15 @@ NTContinuumBuilder::shared_pointer NTContinuumBuilder::add(string const & name,
 
 const std::string NTContinuum::URI("epics:nt/NTContinuum:1.0");
 
-NTContinuum::shared_pointer NTContinuum::wrap(PVStructurePtr const & structure)
+NTContinuum::shared_pointer NTContinuum::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTContinuum::shared_pointer NTContinuum::wrapUnsafe(PVStructurePtr const & structure)
+NTContinuum::shared_pointer NTContinuum::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTContinuum(structure));
+    return shared_pointer(new NTContinuum(pvStructure));
 }
 
 bool NTContinuum::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntenum.cpp b/src/nt/ntenum.cpp
index edcfa08..1ce8a36 100644
--- a/src/nt/ntenum.cpp
+++ b/src/nt/ntenum.cpp
@@ -99,15 +99,15 @@ NTEnumBuilder::shared_pointer NTEnumBuilder::add(string const & name, FieldConst
 
 const std::string NTEnum::URI("epics:nt/NTEnum:1.0");
 
-NTEnum::shared_pointer NTEnum::wrap(PVStructurePtr const & structure)
+NTEnum::shared_pointer NTEnum::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTEnum::shared_pointer NTEnum::wrapUnsafe(PVStructurePtr const & structure)
+NTEnum::shared_pointer NTEnum::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTEnum(structure));
+    return shared_pointer(new NTEnum(pvStructure));
 }
 
 bool NTEnum::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/nthistogram.cpp b/src/nt/nthistogram.cpp
index 7f9bb79..ca5bdb1 100644
--- a/src/nt/nthistogram.cpp
+++ b/src/nt/nthistogram.cpp
@@ -113,15 +113,15 @@ NTHistogramBuilder::shared_pointer NTHistogramBuilder::add(string const & name,
 
 const std::string NTHistogram::URI("epics:nt/NTHistogram:1.0");
 
-NTHistogram::shared_pointer NTHistogram::wrap(PVStructurePtr const & structure)
+NTHistogram::shared_pointer NTHistogram::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTHistogram::shared_pointer NTHistogram::wrapUnsafe(PVStructurePtr const & structure)
+NTHistogram::shared_pointer NTHistogram::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTHistogram(structure));
+    return shared_pointer(new NTHistogram(pvStructure));
 }
 
 bool NTHistogram::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntmatrix.cpp b/src/nt/ntmatrix.cpp
index 0bb3037..5892ae4 100644
--- a/src/nt/ntmatrix.cpp
+++ b/src/nt/ntmatrix.cpp
@@ -117,15 +117,15 @@ NTMatrixBuilder::shared_pointer NTMatrixBuilder::add(string const & name, FieldC
 
 const std::string NTMatrix::URI("epics:nt/NTMatrix:1.0");
 
-NTMatrix::shared_pointer NTMatrix::wrap(PVStructurePtr const & structure)
+NTMatrix::shared_pointer NTMatrix::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTMatrix::shared_pointer NTMatrix::wrapUnsafe(PVStructurePtr const & structure)
+NTMatrix::shared_pointer NTMatrix::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTMatrix(structure));
+    return shared_pointer(new NTMatrix(pvStructure));
 }
 
 bool NTMatrix::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntmultiChannel.cpp b/src/nt/ntmultiChannel.cpp
index 3f5a4fe..dc5adf8 100644
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
@@ -210,15 +210,15 @@ NTMultiChannelBuilder::shared_pointer NTMultiChannelBuilder::add(string const &
 
 const std::string NTMultiChannel::URI("epics:nt/NTMultiChannel:1.0");
 
-NTMultiChannel::shared_pointer NTMultiChannel::wrap(PVStructurePtr const & structure)
+NTMultiChannel::shared_pointer NTMultiChannel::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTMultiChannel::shared_pointer NTMultiChannel::wrapUnsafe(PVStructurePtr const & structure)
+NTMultiChannel::shared_pointer NTMultiChannel::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTMultiChannel(structure));
+    return shared_pointer(new NTMultiChannel(pvStructure));
 }
 
 bool NTMultiChannel::is_a(StructureConstPtr const &structure)
diff --git a/src/nt/ntnameValue.cpp b/src/nt/ntnameValue.cpp
index 44a0269..5dae889 100644
--- a/src/nt/ntnameValue.cpp
+++ b/src/nt/ntnameValue.cpp
@@ -112,10 +112,10 @@ NTNameValueBuilder::shared_pointer NTNameValueBuilder::add(string const & name,
 
 const std::string NTNameValue::URI("epics:nt/NTNameValue:1.0");
 
-NTNameValue::shared_pointer NTNameValue::wrap(PVStructurePtr const & structure)
+NTNameValue::shared_pointer NTNameValue::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
 NTNameValue::shared_pointer NTNameValue::wrapUnsafe(PVStructurePtr const & structure)
diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp
index f985ee0..9da52c9 100644
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -280,15 +280,15 @@ public:
     }
 };
 
-NTNDArray::shared_pointer NTNDArray::wrap(PVStructurePtr const & structure)
+NTNDArray::shared_pointer NTNDArray::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTNDArray::shared_pointer NTNDArray::wrapUnsafe(PVStructurePtr const & structure)
+NTNDArray::shared_pointer NTNDArray::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTNDArray(structure));
+    return shared_pointer(new NTNDArray(pvStructure));
 }
 
 bool NTNDArray::is_a(StructureConstPtr const & structure)
@@ -506,6 +506,15 @@ bool NTNDArray::attachAlarm(PVAlarm &pvAlarm) const
         return false;
 }
 
+bool NTNDArray::attachDisplay(PVDisplay &pvDisplay) const
+{
+    PVStructurePtr dp = getDisplay();
+    if (dp)
+        return pvDisplay.attach(dp);
+    else
+        return false;
+}
+
 PVStructurePtr NTNDArray::getPVStructure() const
 {
     return pvNTNDArray;
diff --git a/src/nt/ntndarrayAttribute.cpp b/src/nt/ntndarrayAttribute.cpp
index b8e6900..3b755e4 100644
--- a/src/nt/ntndarrayAttribute.cpp
+++ b/src/nt/ntndarrayAttribute.cpp
@@ -111,15 +111,15 @@ NTNDArrayAttributeBuilder::shared_pointer NTNDArrayAttributeBuilder::add(string
 
 const std::string NTNDArrayAttribute::URI("epics:nt/NTAttribute:1.0");
 
-NTNDArrayAttribute::shared_pointer NTNDArrayAttribute::wrap(PVStructurePtr const & structure)
+NTNDArrayAttribute::shared_pointer NTNDArrayAttribute::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTNDArrayAttribute::shared_pointer NTNDArrayAttribute::wrapUnsafe(PVStructurePtr const & structure)
+NTNDArrayAttribute::shared_pointer NTNDArrayAttribute::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTNDArrayAttribute(structure));
+    return shared_pointer(new NTNDArrayAttribute(pvStructure));
 }
 
 bool NTNDArrayAttribute::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntscalar.cpp b/src/nt/ntscalar.cpp
index f827559..d60e085 100644
--- a/src/nt/ntscalar.cpp
+++ b/src/nt/ntscalar.cpp
@@ -130,15 +130,15 @@ NTScalarBuilder::shared_pointer NTScalarBuilder::add(string const & name, FieldC
 
 const std::string NTScalar::URI("epics:nt/NTScalar:1.0");
 
-NTScalar::shared_pointer NTScalar::wrap(PVStructurePtr const & structure)
+NTScalar::shared_pointer NTScalar::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTScalar::shared_pointer NTScalar::wrapUnsafe(PVStructurePtr const & structure)
+NTScalar::shared_pointer NTScalar::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTScalar(structure));
+    return shared_pointer(new NTScalar(pvStructure));
 }
 
 bool NTScalar::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntscalarMultiChannel.cpp b/src/nt/ntscalarMultiChannel.cpp
index 922eba1..22bf29d 100644
--- a/src/nt/ntscalarMultiChannel.cpp
+++ b/src/nt/ntscalarMultiChannel.cpp
@@ -207,15 +207,15 @@ NTScalarMultiChannelBuilder::shared_pointer NTScalarMultiChannelBuilder::add(str
 
 const std::string NTScalarMultiChannel::URI("epics:nt/NTScalarMultiChannel:1.0");
 
-NTScalarMultiChannel::shared_pointer NTScalarMultiChannel::wrap(PVStructurePtr const & structure)
+NTScalarMultiChannel::shared_pointer NTScalarMultiChannel::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTScalarMultiChannel::shared_pointer NTScalarMultiChannel::wrapUnsafe(PVStructurePtr const & structure)
+NTScalarMultiChannel::shared_pointer NTScalarMultiChannel::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTScalarMultiChannel(structure));
+    return shared_pointer(new NTScalarMultiChannel(pvStructure));
 }
 
 bool NTScalarMultiChannel::is_a(StructureConstPtr const &structure)
diff --git a/src/nt/nttable.cpp b/src/nt/nttable.cpp
index c91db74..be717a2 100644
--- a/src/nt/nttable.cpp
+++ b/src/nt/nttable.cpp
@@ -127,15 +127,15 @@ NTTableBuilder::shared_pointer NTTableBuilder::add(string const & name, FieldCon
 
 const std::string NTTable::URI("epics:nt/NTTable:1.0");
 
-NTTable::shared_pointer NTTable::wrap(PVStructurePtr const & structure)
+NTTable::shared_pointer NTTable::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTTable::shared_pointer NTTable::wrapUnsafe(PVStructurePtr const & structure)
+NTTable::shared_pointer NTTable::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTTable(structure));
+    return shared_pointer(new NTTable(pvStructure));
 }
 
 bool NTTable::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/ntunion.cpp b/src/nt/ntunion.cpp
index 81890bc..1f9969d 100644
--- a/src/nt/ntunion.cpp
+++ b/src/nt/ntunion.cpp
@@ -100,15 +100,15 @@ NTUnionBuilder::shared_pointer NTUnionBuilder::add(string const & name, FieldCon
 
 const std::string NTUnion::URI("epics:nt/NTUnion:1.0");
 
-NTUnion::shared_pointer NTUnion::wrap(PVStructurePtr const & structure)
+NTUnion::shared_pointer NTUnion::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTUnion::shared_pointer NTUnion::wrapUnsafe(PVStructurePtr const & structure)
+NTUnion::shared_pointer NTUnion::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTUnion(structure));
+    return shared_pointer(new NTUnion(pvStructure));
 }
 
 bool NTUnion::is_a(StructureConstPtr const & structure)
diff --git a/src/nt/nturi.cpp b/src/nt/nturi.cpp
index bcdddec..b446aa3 100644
--- a/src/nt/nturi.cpp
+++ b/src/nt/nturi.cpp
@@ -127,15 +127,15 @@ NTURIBuilder::shared_pointer NTURIBuilder::add(string const & name, FieldConstPt
 
 const std::string NTURI::URI("epics:nt/NTURI:1.0");
 
-NTURI::shared_pointer NTURI::wrap(PVStructurePtr const & structure)
+NTURI::shared_pointer NTURI::wrap(PVStructurePtr const & pvStructure)
 {
-    if(!isCompatible(structure)) return shared_pointer();
-    return wrapUnsafe(structure);
+    if(!isCompatible(pvStructure)) return shared_pointer();
+    return wrapUnsafe(pvStructure);
 }
 
-NTURI::shared_pointer NTURI::wrapUnsafe(PVStructurePtr const & structure)
+NTURI::shared_pointer NTURI::wrapUnsafe(PVStructurePtr const & pvStructure)
 {
-    return shared_pointer(new NTURI(structure));
+    return shared_pointer(new NTURI(pvStructure));
 }
 
 bool NTURI::is_a(StructureConstPtr const & structure)