diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
index f924d815f3b..c6f5e9f362e 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
@@ -14,7 +14,7 @@ import org.eclipse.dd.dsf.concurrent.GetDataDone;
 import org.eclipse.dd.dsf.datamodel.IDMContext;
 import org.eclipse.dd.dsf.debug.service.IRegisters;
 import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterGroupDMContext;
-import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterGroupData;
+import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterGroupDMData;
 import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMProvider;
@@ -23,7 +23,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
 
 @SuppressWarnings("restriction")
-public class RegisterGroupLayoutNode extends AbstractDMVMLayoutNode<IRegisterGroupData> {
+public class RegisterGroupLayoutNode extends AbstractDMVMLayoutNode<IRegisterGroupDMData> {
 
     public RegisterGroupLayoutNode(AbstractVMProvider provider, DsfSession session) {
         super(provider, session, IRegisters.IRegisterGroupDMContext.class);
@@ -53,7 +53,7 @@ public class RegisterGroupLayoutNode extends AbstractDMVMLayoutNode<IRegisterGro
     }
     
     @Override
-    protected void fillColumnLabel(IDMContext<IRegisterGroupData> dmContext, IRegisterGroupData dmData,
+    protected void fillColumnLabel(IDMContext<IRegisterGroupDMData> dmContext, IRegisterGroupDMData dmData,
                                    String columnId, int idx, ILabelUpdate update) 
     {
         if (RegisterColumnPresentation.COL_NAME.equals(columnId)) {
diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java
index d03004c2f7d..57fb46c6b29 100644
--- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java
+++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java
@@ -22,13 +22,13 @@ import org.eclipse.dd.dsf.datamodel.IDMService;
 public interface IRegisters extends IDMService {
 
     /** Register group context */
-    public interface IRegisterGroupDMContext extends IDMContext<IRegisterGroupData> {}
+    public interface IRegisterGroupDMContext extends IDMContext<IRegisterGroupDMData> {}
     
     /** 
-     * Register groups only have a name.  Sub groups and registered are retrieved
+     * Register groups only have a name.  Sub groups and registers are retrieved
      * through the service interface. 
      */
-    public interface IRegisterGroupData extends IDMData {
+    public interface IRegisterGroupDMData extends IDMData {
         public String getName();
         public String getDescription();
     }