diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMLayoutNode.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMLayoutNode.java
index 0542927d929..92dc16e0d3f 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMLayoutNode.java
@@ -444,12 +444,7 @@ abstract public class AbstractVMLayoutNode implements IVMLayoutNode {
             fTreePath = path;
         }
 
-        public Object getElement(TreePath path) { 
-            // If not asking for root, just return the last segment in path.
-            if (path.getSegmentCount() > 0) {
-                return path.getLastSegment();
-            }
-            // Calculate the root of the viewer.
+        public Object getViewerInput() {
             return getVMProvider().getRootElement();
         }
 
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMProvider.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMProvider.java
index 2ba86fa5b25..0359bb59e1f 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMProvider.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMProvider.java
@@ -498,7 +498,7 @@ abstract public class AbstractVMProvider implements IVMProvider
      * @see IViewerInputProvider
      */
     public void update(IViewerInputUpdate update) {
-        update.setViewerInput(update.getElement());
+        update.setInputElement(update.getElement());
         update.done();
     }
     
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
index 2da11734ebc..0ed79ad8e06 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
@@ -35,6 +35,7 @@ public class VMViewerUpdate implements IViewerUpdate {
         fClientUpdate = clientUpdate;
     }
 
+    public Object getViewerInput() { return fClientUpdate.getViewerInput(); }
     public Object getElement() { return fClientUpdate.getElement(); }
     public TreePath getElementPath() { return fClientUpdate.getElementPath(); }
     public IPresentationContext getPresentationContext() { return fClientUpdate.getPresentationContext(); }