diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 8adfb010396..cda0aaaa524 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-04 Mikhail Khodjaiants
+	Complying with Eclipse 3.2 M6. AsynchronousTreeModelViewer has been renamed to AsynchronousTreeViewer.
+	* AbstractViewerState.java
+	* ModulesViewer.java
+	* ModulesViewerState.java
+
 2006-03-29 Mikhail Khodjaiants
 	Allow clients to contribute IRestart adapters.
 	* RestartActionDelegate.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractViewerState.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractViewerState.java
index 2d195badf8b..6a6e3754aef 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractViewerState.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractViewerState.java
@@ -14,9 +14,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer;
-import org.eclipse.debug.internal.ui.viewers.TreePath;
-import org.eclipse.debug.internal.ui.viewers.TreeSelection;
+import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.TreeItem;
 
 /**
@@ -32,7 +32,7 @@ public abstract class AbstractViewerState {
 	/**
 	 * Constructs a memento for the given viewer.
 	 */
-	public AbstractViewerState(AsynchronousTreeModelViewer viewer) {
+	public AbstractViewerState(AsynchronousTreeViewer viewer) {
 		saveState(viewer);
 	}
 
@@ -42,7 +42,7 @@ public abstract class AbstractViewerState {
 	 * 
 	 * @param viewer viewer of which to save the state
 	 */
-	public void saveState(AsynchronousTreeModelViewer viewer) {
+	public void saveState(AsynchronousTreeViewer viewer) {
 		List expanded = new ArrayList();
 		fSavedExpansion = null;
 		TreeItem[] items = viewer.getTree().getItems();
@@ -114,7 +114,7 @@ public abstract class AbstractViewerState {
 	 * 
 	 * @param viewer viewer to which state is restored
 	 */
-	public void restoreState(AsynchronousTreeModelViewer viewer) {
+	public void restoreState(AsynchronousTreeViewer viewer) {
 	    boolean expansionComplete = true;
 	    if (fSavedExpansion != null && fSavedExpansion.size() > 0) {
 			for (int i = 0; i < fSavedExpansion.size(); i++) {
@@ -175,6 +175,6 @@ public abstract class AbstractViewerState {
 	 * @return element represented by the path, or <code>null</code> if none
 	 * @throws DebugException if unable to locate a variable
 	 */
-	protected abstract TreePath decodePath(IPath path, AsynchronousTreeModelViewer viewer) throws DebugException;
+	protected abstract TreePath decodePath(IPath path, AsynchronousTreeViewer viewer) throws DebugException;
 
 }
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
index 103769a6cf6..7bd38456ecc 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.internal.ui.views.modules;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer;
+import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer;
 import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.progress.UIJob;
@@ -21,7 +21,7 @@ import org.eclipse.ui.progress.UIJob;
 /**
  * Asynchronous viewer used by the Modules view.
  */
-public class ModulesViewer extends AsynchronousTreeModelViewer {
+public class ModulesViewer extends AsynchronousTreeViewer {
 	
 	protected ModulesView fView;
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewerState.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewerState.java
index b071ceacd6f..b577ec1b469 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewerState.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewerState.java
@@ -16,8 +16,8 @@ import org.eclipse.cdt.debug.internal.ui.views.AbstractViewerState;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer;
-import org.eclipse.debug.internal.ui.viewers.TreePath;
+import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer;
+import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
  
@@ -29,7 +29,7 @@ public class ModulesViewerState extends AbstractViewerState {
 	/** 
 	 * Constructor for ModulesViewerState. 
 	 */
-	public ModulesViewerState( AsynchronousTreeModelViewer viewer ) {
+	public ModulesViewerState( AsynchronousTreeViewer viewer ) {
 		super( viewer );
 	}
 
@@ -49,7 +49,7 @@ public class ModulesViewerState extends AbstractViewerState {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.views.AbstractViewerState#decodePath(org.eclipse.core.runtime.IPath, org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer)
 	 */
-	protected TreePath decodePath( IPath path, AsynchronousTreeModelViewer viewer ) throws DebugException {
+	protected TreePath decodePath( IPath path, AsynchronousTreeViewer viewer ) throws DebugException {
 		String[] names = path.segments();
 		Tree tree = viewer.getTree();
 		TreeItem[] items = tree.getItems();