diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
index 740cccd2c24..0d5f3157b01 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
@@ -10,6 +10,8 @@
  **********************************************************************/
 package org.eclipse.cdt.ui.tests.DOMAST;
 
+import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
+import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
@@ -18,6 +20,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializer;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
 import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
 import org.eclipse.cdt.core.dom.ast.IASTProblem;
 import org.eclipse.cdt.core.dom.ast.IASTStatement;
@@ -79,6 +82,17 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 	 */
 	public int processDeclarator(IASTDeclarator declarator) {
 		addRoot(declarator);
+		
+		IASTPointerOperator[] ops = declarator.getPointerOperators();
+		for(int i=0; i<ops.length; i++)
+			addRoot(ops[i]);
+		
+		if (declarator instanceof IASTArrayDeclarator) {
+			IASTArrayModifier[] mods = ((IASTArrayDeclarator)declarator).getArrayModifiers();
+			for(int i=0; i<mods.length; i++)
+				addRoot(mods[i]);	
+		}
+		
 		return PROCESS_CONTINUE;
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
index 070d1a5a809..8740431b302 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
@@ -10,6 +10,9 @@
  **********************************************************************/
 package org.eclipse.cdt.ui.tests.DOMAST;
 
+import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
+import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
+import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
@@ -18,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializer;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
 import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
 import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
 import org.eclipse.cdt.core.dom.ast.IASTProblem;
@@ -76,6 +80,17 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 	 */
 	public int processDeclarator(IASTDeclarator declarator) {
 		addRoot(declarator);
+		
+		IASTPointerOperator[] ops = declarator.getPointerOperators();
+		for(int i=0; i<ops.length; i++)
+			addRoot(ops[i]);
+		
+		if (declarator instanceof IASTArrayDeclarator) {
+			IASTArrayModifier[] mods = ((IASTArrayDeclarator)declarator).getArrayModifiers();
+			for(int i=0; i<mods.length; i++)
+				addRoot(mods[i]);	
+		}
+		
 		return PROCESS_CONTINUE;
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
index 98b72fc9ae9..95050cfcea8 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
@@ -10,17 +10,21 @@
  **********************************************************************/
 package org.eclipse.cdt.ui.tests.DOMAST;
 
+import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
 import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
+import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
+import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.core.runtime.IAdaptable;
 
 /**
  * @author dsteffle
  */
 public class TreeObject implements IAdaptable {
+	private static final String FILE_SEPARATOR = "\\";
 	public static final String BLANK_FILENAME = ""; //$NON-NLS-1$
 	private static final String IGCCAST_PREFIX = "IGCCAST"; //$NON-NLS-1$
 	private static final String IGNUAST_PREFIX = "IGNUAST"; //$NON-NLS-1$
@@ -73,11 +77,42 @@ public class TreeObject implements IAdaptable {
 			}
 		}
 		
-		if ( node instanceof IASTName ) {
+		if ( node instanceof IASTSimpleDeclaration ) {
+			IASTDeclarator[] decltors = ((IASTSimpleDeclaration)node).getDeclarators();
+			
+			if ( decltors.length > 0 ) {
+				buffer.append(START_OF_LIST);
+				for (int i=0; i<decltors.length; i++) {
+					buffer.append(decltors[i].getName());
+					
+					if (i+1<decltors.length)
+						buffer.append(LIST_SEPARATOR);
+				}
+			}
+			return buffer.toString();
+		} else if ( node instanceof IASTFunctionDefinition ) {
+			String name = ((IASTFunctionDefinition)node).getDeclarator().getName().toString();
+			if (name != null) {
+				buffer.append(START_OF_LIST);
+				buffer.append(name);
+			}
+			return buffer.toString();
+		} else if ( node instanceof IASTName ) {
 			buffer.append(START_OF_LIST);
 			buffer.append(node);
+			return buffer.toString();
+		} else if ( node instanceof IASTTranslationUnit ) {
+			String fileName = getFilename();
+			int lastSlash = fileName.lastIndexOf(FILE_SEPARATOR);
+			
+			if (lastSlash > 0) {
+				buffer.append(START_OF_LIST);
+				buffer.append(fileName.substring(lastSlash+1)); // TODO make path relative to project, i.e. /projectName/path/file.c
+			}
+			
+			return buffer.toString();
 		}
-
+		
 		return buffer.toString();
 	}
 	public Object getAdapter(Class key) {