diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
index 879f3ad6fa4..b4005457e3d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
@@ -39,7 +39,7 @@ abstract public class AbstractDMContext extends PlatformObject
     private final IDMContext[] fParents;
 
     /** 
-     * Main constructor provides all data needed to implement the IModelContext
+     * Main constructor provides all data needed to implement the <code>IDMContext</code>
      * interface.
      */
     public AbstractDMContext(String sessionId, IDMContext[] parents) {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
index 827319965ed..971c964093d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
@@ -30,7 +30,7 @@ public class CompositeDMContext implements IDMContext {
     private final IDMContext[] fParents;
     
     /** 
-     * Main constructor provides all data needed to implement the IModelContext
+     * Main constructor provides all data needed to implement the <code>IDMContext</code>
      * interface.
      * @param parents Array of parent contexts that this composite context is
      * made up of.  It can be an empty array, but it cannot be null.
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
index a17eb43823f..4cd415b0ddd 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
@@ -268,8 +268,8 @@ public class DsfSession
     private Map<ListenerEntry,Method[]> fListeners = new HashMap<ListenerEntry,Method[]>();
     
     /** 
-     * Map of registered adapters, for implementing the 
-     * IModelContext.getAdapter() method.
+     * Map of registered adapters, for implementing the <code>IDMContext.getAdapter()</code> 
+     * method.
      * @see org.eclipse.cdt.dsf.datamodel.AbstractDMContext#getAdapter 
      */
     private Map<Class<?>,Object> fAdapters = Collections.synchronizedMap(new HashMap<Class<?>,Object>());
@@ -364,7 +364,7 @@ public class DsfSession
     }
     
     /**
-     * Registers a IModelContext adapter of given type.
+     * Registers a <code>IDMContext</code> adapter of given type.
      * @param adapterType class type to register the adapter for
      * @param adapter adapter instance to register
      * @see org.eclipse.dsdp.model.AbstractDMContext#getAdapter
@@ -388,7 +388,7 @@ public class DsfSession
     }
     
     /**
-     * Un-registers a IModelContext adapter of given type.
+     * Un-registers a <code>IDMContext</code> adapter of given type.
      * @param adapterType adapter type to unregister
      * @see org.eclipse.dsdp.model.AbstractDMContext#getAdapter
      */
@@ -410,7 +410,7 @@ public class DsfSession
     }
     
     /** 
-     * Retrieves an adapter for given type for IModelContext.
+     * Retrieves an adapter for given type for <code>IDMContext</code>.
      * @param adapterType adapter type to look fors
      * @return adapter object for given type, null if none is registered with the session
      * @see org.eclipse.dsdp.model.AbstractDMContext#getAdapter