diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/SourceDisplayAdapter.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
similarity index 98%
rename from plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/SourceDisplayAdapter.java
rename to plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
index 6deabb6d97d..7e3e9e63e68 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/SourceDisplayAdapter.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
@@ -36,7 +36,7 @@ import org.eclipse.dd.dsf.debug.service.StepQueueManager;
 import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason;
 import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext;
 import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMData;
-import org.eclipse.dd.dsf.debug.sourcelookup.DsfMISourceLookupParticipant;
+import org.eclipse.dd.dsf.debug.sourcelookup.DsfSourceLookupParticipant;
 import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
 import org.eclipse.dd.dsf.service.DsfServicesTracker;
 import org.eclipse.dd.dsf.service.DsfSession;
@@ -81,7 +81,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
  * dispatch thread to synchronize access to the state data of the running jobs.
  */
 @ThreadSafe
-public class SourceDisplayAdapter implements ISourceDisplay 
+public class DsfSourceDisplayAdapter implements ISourceDisplay 
 {
     /**
 	 * A job to perform source lookup on the given DMC.
@@ -389,7 +389,7 @@ public class SourceDisplayAdapter implements ISourceDisplay
     private IDMContext fPrevModelContext;
     private SourceLookupResult fPrevResult;
     private ISourceLookupDirector fSourceLookup;
-    private DsfMISourceLookupParticipant fSourceLookupParticipant;
+    private DsfSourceLookupParticipant fSourceLookupParticipant;
     private InstructionPointerManager fIPManager;
     
     private LookupJob fRunningLookupJob;
@@ -398,12 +398,12 @@ public class SourceDisplayAdapter implements ISourceDisplay
     private ClearingJob fRunningClearingJob;
     private List<IRunControl.IExecutionDMContext> fPendingExecDmcsToClear = new LinkedList<IRunControl.IExecutionDMContext>();
     
-    public SourceDisplayAdapter(DsfSession session, ISourceLookupDirector sourceLocator) {
+    public DsfSourceDisplayAdapter(DsfSession session, ISourceLookupDirector sourceLocator) {
         fSession = session;
         fExecutor = session.getExecutor();
         fServicesTracker = new DsfServicesTracker(DsfDebugUIPlugin.getBundleContext(), session.getId());
         fSourceLookup = sourceLocator;
-        fSourceLookupParticipant = new DsfMISourceLookupParticipant(session); 
+        fSourceLookupParticipant = new DsfSourceLookupParticipant(session); 
         fSourceLookup.addParticipants(new ISourceLookupParticipant[] {fSourceLookupParticipant} );
 
         fIPManager = new InstructionPointerManager();
diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
similarity index 97%
rename from plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java
rename to plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
index 565ddfa6de3..9457beb423e 100644
--- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java
+++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
@@ -41,9 +41,10 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
 
 /**
+ * Source lookup participant that should be used with DSF-based debuggers.
  */
 @ThreadSafe
-public class DsfMISourceLookupParticipant implements ISourceLookupParticipant {
+public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
     protected static final Object[] EMPTY = new Object[0]; 
 
     private DsfExecutor fExecutor;
@@ -52,7 +53,7 @@ public class DsfMISourceLookupParticipant implements ISourceLookupParticipant {
     private ISourceLookupDirector fDirector;
     private Map<String, List<Object>> fLookupCache = Collections.synchronizedMap(new HashMap<String, List<Object>>());
         
-    public DsfMISourceLookupParticipant(DsfSession session) {
+    public DsfSourceLookupParticipant(DsfSession session) {
         fSessionId = session.getId();
         fExecutor = session.getExecutor();
         fServicesTracker = new DsfServicesTracker(DsfDebugPlugin.getBundleContext(), fSessionId);
diff --git a/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/PDAAdapterFactory.java b/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/PDAAdapterFactory.java
index b19ebafa7d2..adfc577442e 100644
--- a/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/PDAAdapterFactory.java
+++ b/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/PDAAdapterFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.dd.dsf.debug.ui.actions.DsfStepIntoCommand;
 import org.eclipse.dd.dsf.debug.ui.actions.DsfStepOverCommand;
 import org.eclipse.dd.dsf.debug.ui.actions.DsfStepReturnCommand;
 import org.eclipse.dd.dsf.debug.ui.actions.DsfSuspendCommand;
-import org.eclipse.dd.dsf.debug.ui.sourcelookup.SourceDisplayAdapter;
+import org.eclipse.dd.dsf.debug.ui.sourcelookup.DsfSourceDisplayAdapter;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.examples.pda.PDAPlugin;
 import org.eclipse.dd.examples.pda.launch.PDALaunch;
@@ -68,7 +68,7 @@ public class PDAAdapterFactory implements IAdapterFactory, ILaunchesListener2
         final PDAVMAdapter fViewModelAdapter;
         
         // Source lookup and positioning adapter
-        final SourceDisplayAdapter fSourceDisplayAdapter;
+        final DsfSourceDisplayAdapter fSourceDisplayAdapter;
         
         // Command adapters
         final DsfStepIntoCommand fStepIntoCommand;
@@ -91,7 +91,7 @@ public class PDAAdapterFactory implements IAdapterFactory, ILaunchesListener2
             fViewModelAdapter = new PDAVMAdapter(session);
 
             // Initialize source lookup
-            fSourceDisplayAdapter = new SourceDisplayAdapter(session, (ISourceLookupDirector)launch.getSourceLocator());
+            fSourceDisplayAdapter = new DsfSourceDisplayAdapter(session, (ISourceLookupDirector)launch.getSourceLocator());
             session.registerModelAdapter(ISourceDisplay.class, fSourceDisplayAdapter);
             
             // Initialize retargetable command handler.
diff --git a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/GdbAdapterFactory.java b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/GdbAdapterFactory.java
index a156c8d7fdd..5bc506c8f50 100644
--- a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/GdbAdapterFactory.java
+++ b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/GdbAdapterFactory.java
@@ -23,7 +23,7 @@ import org.eclipse.dd.dsf.debug.ui.actions.DsfStepOverCommand;
 import org.eclipse.dd.dsf.debug.ui.actions.DsfStepReturnCommand;
 import org.eclipse.dd.dsf.debug.ui.actions.DsfSuspendCommand;
 import org.eclipse.dd.dsf.debug.ui.contexts.DsfSuspendTrigger;
-import org.eclipse.dd.dsf.debug.ui.sourcelookup.SourceDisplayAdapter;
+import org.eclipse.dd.dsf.debug.ui.sourcelookup.DsfSourceDisplayAdapter;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.gdb.internal.ui.actions.DsfTerminateCommand;
 import org.eclipse.dd.gdb.internal.ui.viewmodel.GdbViewModelAdapter;
@@ -61,7 +61,7 @@ public class GdbAdapterFactory
     class SessionAdapterSet {
         final GdbLaunch fLaunch;
         final GdbViewModelAdapter fViewModelAdapter;
-        final SourceDisplayAdapter fSourceDisplayAdapter;
+        final DsfSourceDisplayAdapter fSourceDisplayAdapter;
         final DsfStepIntoCommand fStepIntoCommand;
         final DsfStepOverCommand fStepOverCommand;
         final DsfStepReturnCommand fStepReturnCommand;
@@ -78,7 +78,7 @@ public class GdbAdapterFactory
             fViewModelAdapter = new GdbViewModelAdapter(session);
 
             if (launch.getSourceLocator() instanceof ISourceLookupDirector) {
-                fSourceDisplayAdapter = new SourceDisplayAdapter(session, (ISourceLookupDirector)launch.getSourceLocator());
+                fSourceDisplayAdapter = new DsfSourceDisplayAdapter(session, (ISourceLookupDirector)launch.getSourceLocator());
             } else {
                 fSourceDisplayAdapter = null;
             }