Committed patch for Devin Steffler.

FIXED 88333 - [DOM AST] ASTNodeProperty needs more descriptive value

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTNodeProperty.java

@@ -20,7 +20,7 @@ package org.eclipse.cdt.core.dom.ast;
  */
 public class ASTNodeProperty {
 
-	private String name;
+	private String name = ""; //$NON-NLS-1$
 
 	/**
 	 * @param n
@@ -47,4 +47,8 @@ public class ASTNodeProperty {
 	public void setName(String name) {
 		this.name = name;
 	}
+	
+	public String toString() {
+		return getName();
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArrayDeclarator.java

@@ -22,7 +22,7 @@ public interface IASTArrayDeclarator extends IASTDeclarator {
 	 * <code>IASTArrayDeclarator</code> and an <code>IASTArrayModifier</code>.
 	 */
 	public static final ASTNodeProperty ARRAY_MODIFIER = new ASTNodeProperty(
-			"Array Modifier"); //$NON-NLS-1$
+			"IASTArrayDeclarator.ARRAY_MODIFIER - IASTArrayModifier for IASTArrayDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * Get all <code>IASTArrayModifier</code>'s for this declarator.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArrayModifier.java

@@ -22,7 +22,7 @@ public interface IASTArrayModifier extends IASTNode {
 	 * <code>IASTArrayModifier</code> and an <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty CONSTANT_EXPRESSION = new ASTNodeProperty(
-			"Constant Expression"); //$NON-NLS-1$
+			"IASTArrayModifier.CONSTANT_EXPRESSION - IASTExpression for IASTArrayModifier"); //$NON-NLS-1$
 
 	/**
 	 * <code>EMPTY_ARRAY</code> is referred to in implementations

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArraySubscriptExpression.java

@@ -22,7 +22,7 @@ public interface IASTArraySubscriptExpression extends IASTExpression {
 	 * <code>IASTArraySubscriptExpression</code> and an
 	 * <code>IASTExpression</code> representing the subscript.
 	 */
-	public static final ASTNodeProperty ARRAY = new ASTNodeProperty("Array"); //$NON-NLS-1$
+	public static final ASTNodeProperty ARRAY = new ASTNodeProperty("IASTArraySubscriptExpression.ARRAY - IASTExpression representing the Array"); //$NON-NLS-1$
 
 	/**
 	 * Get the expression that represents the array.
@@ -45,7 +45,7 @@ public interface IASTArraySubscriptExpression extends IASTExpression {
 	 * <code>IASTExpression</code> representing the array.
 	 */
 	public static final ASTNodeProperty SUBSCRIPT = new ASTNodeProperty(
-			"Subscript"); //$NON-NLS-1$
+			"IASTArraySubscriptExpression.SUBSCRIPT - IASTExpression representing the Subscript"); //$NON-NLS-1$
 
 	/**
 	 * Get the subscript expression.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryExpression.java

@@ -23,7 +23,7 @@ public interface IASTBinaryExpression extends IASTExpression {
 	 * representing the lhs.
 	 */
 	public static final ASTNodeProperty OPERAND_ONE = new ASTNodeProperty(
-			"Operand 1"); //$NON-NLS-1$
+			"IASTBinaryExpression.OPERAND_ONE - IASTExpression for LHS"); //$NON-NLS-1$
 
 	/**
 	 * Node property that describes the relationship between an
@@ -31,7 +31,7 @@ public interface IASTBinaryExpression extends IASTExpression {
 	 * representing the rhs.
 	 */
 	public static final ASTNodeProperty OPERAND_TWO = new ASTNodeProperty(
-			"Operand 2"); //$NON-NLS-1$
+			"IASTBinaryExpression.OPERAND_TWO - IASTExpression for RHS"); //$NON-NLS-1$
 
 	/**
 	 * Set the operator.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java

@@ -25,7 +25,7 @@ public interface IASTCaseStatement extends IASTStatement {
 	 * case statement and the expression it contains.
 	 */
 	public static final ASTNodeProperty EXPRESSION = new ASTNodeProperty(
-			"expression"); //$NON-NLS-1$
+			"IASTCaseStatement.EXPRESSION - expression for case statement"); //$NON-NLS-1$
 
 	/**
 	 * The expression that determines whether this case should be taken.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCastExpression.java

@@ -44,7 +44,7 @@ public interface IASTCastExpression extends IASTExpression {
 	 * <code>OPERAND</code> represents the relationship between a cast
 	 * expression and the expression it is casting (operand).
 	 */
-	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("Operand"); //$NON-NLS-1$
+	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("IASTCastExpression.OPERAND - expression being cast"); //$NON-NLS-1$
 
 	/**
 	 * Get expression being cast.
@@ -65,7 +65,7 @@ public interface IASTCastExpression extends IASTExpression {
 	 * <code>TYPE_ID</code> represents the relationship between a cast
 	 * expression and the type cast to.
 	 */
-	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("Type Id"); //$NON-NLS-1$
+	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("IASTCastExpression.TYPE_ID - Type Id expression is cast to"); //$NON-NLS-1$
 
 	/**
 	 * Set the typeId.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java

@@ -23,14 +23,14 @@ public interface IASTCompositeTypeSpecifier extends IASTDeclSpecifier , IASTName
 	 * <code>IASTCompositeTypeSpecifier</code> and its <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty TYPE_NAME = new ASTNodeProperty(
-			"Type Name"); //$NON-NLS-1$
+			"IASTCompositeTypeSpecifier.TYPE_NAME - IASTName for IASTCompositeTypeSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * <code>MEMBER_DECLARATION</code> represents the relationship between an
 	 * <code>IASTCompositeTypeSpecifier</code> and its nested<code>IASTDeclaration</code>s.
 	 */
 	public static final ASTNodeProperty MEMBER_DECLARATION = new ASTNodeProperty(
-			"Member Declaration"); //$NON-NLS-1$
+			"IASTCompositeTypeSpecifier.MEMBER_DECLARATION - Nested IASTDeclaration for IASTCompositeTypeSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * Get the type (key) of this composite specifier.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompoundStatement.java

@@ -23,7 +23,7 @@ public interface IASTCompoundStatement extends IASTStatement {
 	 * <code>IASTStatement</code>
 	 */
 	public static final ASTNodeProperty NESTED_STATEMENT = new ASTNodeProperty(
-			"Nested Statement"); //$NON-NLS-1$
+			"IASTCompoundStatement.NESTED_STATEMENT - nested IASTStatement for IASTCompoundStatement"); //$NON-NLS-1$
 
 	/**
 	 * Gets the statements in this block.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java

@@ -22,7 +22,7 @@ public interface IASTConditionalExpression extends IASTExpression {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty LOGICAL_CONDITION = new ASTNodeProperty(
-			"Logical Condition"); //$NON-NLS-1$
+			"IASTConditionalExpression.LOGICAL_CONDITION - Logical Condition"); //$NON-NLS-1$
 
 	/**
 	 * <code>POSITIVE_RESULT</code> represents the relationship between an
@@ -30,7 +30,7 @@ public interface IASTConditionalExpression extends IASTExpression {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty POSITIVE_RESULT = new ASTNodeProperty(
-			"Positive Result"); //$NON-NLS-1$
+			"IASTConditionalExpression.POSITIVE_RESULT - Positive Result"); //$NON-NLS-1$
 
 	/**
 	 * <code>NEGATIVE_RESULT</code> represents the relationship between an
@@ -38,7 +38,7 @@ public interface IASTConditionalExpression extends IASTExpression {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty NEGATIVE_RESULT = new ASTNodeProperty(
-			"Negative Result"); //$NON-NLS-1$
+			"IASTConditionalExpression.NEGATIVE_RESULT - Negative Result"); //$NON-NLS-1$
 
 	/**
 	 * Get the logical condition expression.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java

@@ -22,7 +22,7 @@ public interface IASTDeclarationStatement extends IASTStatement {
 	 * declaration statement and the declaration it wraps.
 	 */
 	public static final ASTNodeProperty DECLARATION = new ASTNodeProperty(
-			"Declaration"); //$NON-NLS-1$
+			"IASTDeclarationStatement.DECLARATION - Declaration for DeclarationStatement"); //$NON-NLS-1$
 
 	/**
 	 * Gets the declaration introduced by this statement.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarator.java

@@ -27,28 +27,28 @@ public interface IASTDeclarator extends IASTNode, IASTNameOwner {
 	 * <code>IASTDeclarator</code> and an <code>IASTPointerOperator</code>.
 	 */
 	public static final ASTNodeProperty POINTER_OPERATOR = new ASTNodeProperty(
-			"Pointer Operator"); //$NON-NLS-1$
+			"IASTDeclarator.POINTER_OPERATOR - IASTPointerOperator for IASTDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * <code>INITIALIZER</code> represents the relationship between an
 	 * <code>IASTDeclarator</code> and an <code>IASTInitializer</code>.
 	 */
 	public static final ASTNodeProperty INITIALIZER = new ASTNodeProperty(
-			"Initializer"); //$NON-NLS-1$
+			"IASTDeclarator.INITIALIZER - IASTInitializer for IASTDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * <code>NESTED_DECLARATOR</code> represents the relationship between an
 	 * <code>IASTDeclarator</code> and a nested <code>IASTDeclarator</code>.
 	 */
 	public static final ASTNodeProperty NESTED_DECLARATOR = new ASTNodeProperty(
-			"Nested Declarator"); //$NON-NLS-1$
+			"IASTDeclarator.NESTED_DECLARATOR - Nested IASTDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * <code>DECLARATOR_NAME</code> represents the relationship between an
 	 * <code>IASTDeclarator</code> and an <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty DECLARATOR_NAME = new ASTNodeProperty(
-			"Declarator Name"); //$NON-NLS-1$
+			"IASTDeclarator.DECLARATOR_NAME - IASTName for IASTDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * This is the list of pointer operators applied to the type for the

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java

@@ -22,7 +22,7 @@ public interface IASTDoStatement extends IASTStatement {
 	 * <code>IASTDoStatement</code> and its nested body
 	 * <code>IASTStatement</code>.
 	 */
-	public static final ASTNodeProperty BODY = new ASTNodeProperty("body"); //$NON-NLS-1$
+	public static final ASTNodeProperty BODY = new ASTNodeProperty("IASTDoStatement.BODY - nested body for IASTDoStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>CONDITION</code> represents the relationship between a
@@ -30,7 +30,7 @@ public interface IASTDoStatement extends IASTStatement {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty CONDITION = new ASTNodeProperty(
-			"condition"); //$NON-NLS-1$
+			"IASTDoStatement.CONDITION - IASTExpression condition for IASTDoStatement"); //$NON-NLS-1$
 
 	/**
 	 * Get the body of the loop.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java

@@ -56,7 +56,7 @@ public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTName
 	 * <code>IASTElaboratedTypeSpecifier</code> and <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty TYPE_NAME = new ASTNodeProperty(
-			"Type Name"); //$NON-NLS-1$
+			"IASTElaboratedTypeSpecifier.TYPE_NAME - IASTName for IASTElaboratedTypeSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * Get the name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java

@@ -32,7 +32,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 		 * <code>IASTEnumerator</code> and <code>IASTName</code>.
 		 */
 		public static final ASTNodeProperty ENUMERATOR_NAME = new ASTNodeProperty(
-				"Enumerator Name"); //$NON-NLS-1$
+				"IASTEnumerator.ENUMERATOR_NAME - IASTName for IASTEnumerator"); //$NON-NLS-1$
 
 		/**
 		 * Set the enumerator's name.
@@ -53,7 +53,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 		 * <code>IASTEnumerator</code> and <code>IASTExpression</code>.
 		 */
 		public static final ASTNodeProperty ENUMERATOR_VALUE = new ASTNodeProperty(
-				"Enumerator Value"); //$NON-NLS-1$
+				"IASTEnumerator.ENUMERATOR_VALUE - IASTExpression (value) for IASTEnumerator"); //$NON-NLS-1$
 
 		/**
 		 * Set enumerator value.
@@ -77,7 +77,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 	 * <code>IASTEnumerator</code>s.
 	 */
 	public static final ASTNodeProperty ENUMERATOR = new ASTNodeProperty(
-			"Enumerator"); //$NON-NLS-1$
+			"IASTEnumerationSpecifier.ENUMERATOR - nested IASTEnumerator for IASTEnumerationSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * Add an enumerator.
@@ -99,7 +99,7 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 	 * <code>IASTEnumerationSpecifier</code> and its <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty ENUMERATION_NAME = new ASTNodeProperty(
-			"Enum Name"); //$NON-NLS-1$
+			"IASTEnumerationSpecifier.ENUMERATION_NAME - IASTName for IASTEnumerationSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * Set the enum's name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionList.java

@@ -22,7 +22,7 @@ public interface IASTExpressionList extends IASTExpression {
 	 * <code>IASTExpression</code>s.
 	 */
 	public static final ASTNodeProperty NESTED_EXPRESSION = new ASTNodeProperty(
-			"Nested Expression"); //$NON-NLS-1$
+			"IASTExpressionList.NESTED_EXPRESSION - Nested IASTExpression for IASTExpressionList"); //$NON-NLS-1$
 
 	/**
 	 * Get nested expressions.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java

@@ -22,7 +22,7 @@ public interface IASTExpressionStatement extends IASTStatement {
 	 * <code>IASTExpressionStatement</code> and an <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty EXPFRESSION = new ASTNodeProperty(
-			"Expression"); //$NON-NLS-1$
+			"IASTExpressionStatement.IASTStatement - IASTExpression for IASTExpressionStatement"); //$NON-NLS-1$
 
 	/**
 	 * Get the expression in this statement.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java

@@ -23,7 +23,7 @@ public interface IASTFieldDeclarator extends IASTDeclarator {
 	 * <code>IASTFieldDeclarator</code> and its <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty FIELD_SIZE = new ASTNodeProperty(
-			"BitField Size"); //$NON-NLS-1$
+			"IASTFieldDeclarator.FIELD_SIZE - BitField Size of IASTFieldDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * This returns the number of bits if this is a bit field. If it is not a

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java

@@ -25,7 +25,7 @@ public interface IASTFieldReference extends IASTExpression, IASTNameOwner {
 	 * field owner.
 	 */
 	public static final ASTNodeProperty FIELD_OWNER = new ASTNodeProperty(
-			"Field Owner"); //$NON-NLS-1$
+			"IASTFieldReference.FIELD_OWNER - IASTFieldReference's Owner"); //$NON-NLS-1$
 
 	/**
 	 * <code>FIELD_NAME</code> represents the relationship between a
@@ -33,7 +33,7 @@ public interface IASTFieldReference extends IASTExpression, IASTNameOwner {
 	 * name.
 	 */
 	public static final ASTNodeProperty FIELD_NAME = new ASTNodeProperty(
-			"Field Name"); //$NON-NLS-1$
+			"IASTFieldReference.FIELD_NAME - IASTName for IASTFieldReference"); //$NON-NLS-1$
 
 	/**
 	 * This returns an expression for the object containing the field.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java

@@ -24,7 +24,7 @@ public interface IASTForStatement extends IASTStatement {
 	 * initializer.
 	 */
 	public static final ASTNodeProperty INITEXPRESSION = new ASTNodeProperty(
-			"initExpression"); //$NON-NLS-1$
+			"IASTForStatement.INITEXPRESSION - IASTExpression initializer for IASTForStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>INITDECLARATION</code> represents the relationship between a
@@ -32,7 +32,7 @@ public interface IASTForStatement extends IASTStatement {
 	 * initializer.
 	 */
 	public static final ASTNodeProperty INITDECLARATION = new ASTNodeProperty(
-			"initDeclaration"); //$NON-NLS-1$
+			"IASTForStatement.INITDECLARATION - IASTDeclaration initializer for IASTForStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>CONDITION</code> represents the relationship between a
@@ -40,7 +40,7 @@ public interface IASTForStatement extends IASTStatement {
 	 * condition.
 	 */
 	public static final ASTNodeProperty CONDITION = new ASTNodeProperty(
-			"condition"); //$NON-NLS-1$
+			"IASTForStatement.CONDITION - IASTExpression condition of IASTForStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>ITERATION</code> represents the relationship between a
@@ -48,14 +48,14 @@ public interface IASTForStatement extends IASTStatement {
 	 * iteration expression.
 	 */
 	public static final ASTNodeProperty ITERATION = new ASTNodeProperty(
-			"iteration"); //$NON-NLS-1$
+			"IASTForStatement.ITERATION - IASTExpression iteration of IASTForStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>BODY</code> represents the relationship between a
 	 * <code>IASTForStatement</code> and its <code>IASTStatement</code>
 	 * body.
 	 */
-	public static final ASTNodeProperty BODY = new ASTNodeProperty("body"); //$NON-NLS-1$
+	public static final ASTNodeProperty BODY = new ASTNodeProperty("IASTForStatement.BODY - IASTStatement body of IASTForStatement"); //$NON-NLS-1$
 
 	/**
 	 * Get the initial expression for the loop. Returns null if there is none.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java

@@ -23,7 +23,7 @@ public interface IASTFunctionCallExpression extends IASTExpression {
 	 * <code>IASTExpression</code> (function name).
 	 */
 	public static final ASTNodeProperty FUNCTION_NAME = new ASTNodeProperty(
-			"Function Name"); //$NON-NLS-1$
+			"IASTFunctionCallExpression.FUNCTION_Name - IASTExpression (name) for IASTFunctionCallExpression"); //$NON-NLS-1$
 
 	/**
 	 * Set the function name expression.
@@ -46,7 +46,7 @@ public interface IASTFunctionCallExpression extends IASTExpression {
 	 * <code>IASTExpression</code> (parameters).
 	 */
 	public static final ASTNodeProperty PARAMETERS = new ASTNodeProperty(
-			"Parameters"); //$NON-NLS-1$
+			"IASTFunctionCallExpression.PARAMETERS - IASTExpression (parameters) for IASTFunctionCallExpression"); //$NON-NLS-1$
 
 	/**
 	 * Set the parameters expression.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDefinition.java

@@ -23,7 +23,7 @@ public interface IASTFunctionDefinition extends IASTDeclaration {
 	 * <code>IASTDeclSpecifier</code>.
 	 */
 	public static final ASTNodeProperty DECL_SPECIFIER = new ASTNodeProperty(
-			"Decl Specifier"); //$NON-NLS-1$
+			"IASTFunctionDefinition.DECL_SPECIFIER - IASTDeclSpecifier for IASTFunctionDefinition"); //$NON-NLS-1$
 
 	/**
 	 * <code>DECLARATOR</code> represents the relationship between a
@@ -31,14 +31,14 @@ public interface IASTFunctionDefinition extends IASTDeclaration {
 	 * <code>IASTFunctionDeclarator</code>.
 	 */
 	public static final ASTNodeProperty DECLARATOR = new ASTNodeProperty(
-			"Declarator"); //$NON-NLS-1$
+			"IASTFunctionDefinition.DECLARATOR - IASTFunctionDeclarator for IASTFunctionDefinition"); //$NON-NLS-1$
 
 	/**
 	 * <code>FUNCTION_BODY</code> represents the relationship between a
 	 * <code>IASTFunctionDefinition</code> and its <code>IASTStatement</code>.
 	 */
 	public static final ASTNodeProperty FUNCTION_BODY = new ASTNodeProperty(
-			"Function Body"); //$NON-NLS-1$
+			"IASTFunctionDefinition.FUNCTION_BODY - Function Body for IASTFunctionDefinition"); //$NON-NLS-1$
 
 	/**
 	 * Get the decl specifier for the function.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java

@@ -17,7 +17,7 @@ package org.eclipse.cdt.core.dom.ast;
  */
 public interface IASTGotoStatement extends IASTStatement, IASTNameOwner {
 
-	public static final ASTNodeProperty NAME = new ASTNodeProperty("name"); //$NON-NLS-1$
+	public static final ASTNodeProperty NAME = new ASTNodeProperty("IASTGotoStatement.NAME - Name for IASTGotoStatement"); //$NON-NLS-1$
 
 	/**
 	 * Returns the name of the label. The name resolves to a ILabel binding.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java

@@ -22,7 +22,7 @@ public interface IASTIdExpression extends IASTExpression, IASTNameOwner {
 	 * <code>IASTIdExpression</code> and a <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty ID_NAME = new ASTNodeProperty(
-			"IdExpression Name"); //$NON-NLS-1$
+			"IASTIdExpression.ID_NAME - IASTName for IASTIdExpression"); //$NON-NLS-1$
 
 	/**
 	 * Returns the name used in the expression.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java

@@ -22,21 +22,21 @@ public interface IASTIfStatement extends IASTStatement {
 	 * <code>IASTIfStatement</code> and its nested <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty CONDITION = new ASTNodeProperty(
-			"condition"); //$NON-NLS-1$
+			"IASTIfStatement.CONDITION - IASTExpression condition for IASTIfStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>THEN</code> represents the relationship between an
 	 * <code>IASTIfStatement</code> and its nested <code>IASTStatement</code>
 	 * (then).
 	 */
-	public static final ASTNodeProperty THEN = new ASTNodeProperty("then"); //$NON-NLS-1$
+	public static final ASTNodeProperty THEN = new ASTNodeProperty("IASTIfStatement.THEN - IASTStatement (then) for IASTIfStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>ELSE</code> represents the relationship between an
 	 * <code>IASTIfStatement</code> and its nested <code>IASTStatement</code>
 	 * (else).
 	 */
-	public static final ASTNodeProperty ELSE = new ASTNodeProperty("else"); //$NON-NLS-1$
+	public static final ASTNodeProperty ELSE = new ASTNodeProperty("IASTIfStatement.ELSE - IASTStatement (else) for IASTIfStatement"); //$NON-NLS-1$
 
 	/**
 	 * Get the condition in the if statement.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java

@@ -22,7 +22,7 @@ public interface IASTInitializerExpression extends IASTInitializer {
 	 * an <code>IASTInitializerExpression</code>. and its <code></code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty INITIALIZER_EXPRESSION = new ASTNodeProperty(
-			"Initializer Expression"); //$NON-NLS-1$
+			"IASTInitializerExpression.INITIALIZER_EXPRESSION - IASTExpression for IASTInitializerExpression"); //$NON-NLS-1$
 
 	/**
 	 * Get the expression for the initializer.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java

@@ -22,7 +22,7 @@ public interface IASTInitializerList extends IASTInitializer {
 	 * <code>IASTInitializerList</code> and its sub-<code>IASTInitializer</code>s.
 	 */
 	public static final ASTNodeProperty NESTED_INITIALIZER = new ASTNodeProperty(
-			"Nested Initializer"); //$NON-NLS-1$
+			"IASTInitializerList.NESTED_INITIALIZER - sub-IASTInitializer for IASTInitializerList"); //$NON-NLS-1$
 
 	/**
 	 * Get the list of initializers.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java

@@ -17,7 +17,7 @@ package org.eclipse.cdt.core.dom.ast;
  */
 public interface IASTLabelStatement extends IASTStatement, IASTNameOwner {
 
-	public static final ASTNodeProperty NAME = new ASTNodeProperty("name"); //$NON-NLS-1$
+	public static final ASTNodeProperty NAME = new ASTNodeProperty("IASTLabelStatement.NAME - name for IASTLabelStatement"); //$NON-NLS-1$
 
 	/**
 	 * The name for the label. The name resolves to an ILabel binding.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java

@@ -23,7 +23,7 @@ public interface IASTNamedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner
 	 * <code>IASTNamedTypeSpecifier</code> and its nested
 	 * <code>IASTName</code>.
 	 */
-	public static final ASTNodeProperty NAME = new ASTNodeProperty("Name"); //$NON-NLS-1$
+	public static final ASTNodeProperty NAME = new ASTNodeProperty("IASTNamedTypeSpecifier.NAME - IASTName for IASTNamedTypeSpecifier"); //$NON-NLS-1$
 
 	/**
 	 * Get the name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTParameterDeclaration.java

@@ -27,7 +27,7 @@ public interface IASTParameterDeclaration extends IASTNode {
 	 * <code>IASTDeclSpecifier</code>.
 	 */
 	public static final ASTNodeProperty DECL_SPECIFIER = new ASTNodeProperty(
-			"Decl Specifier"); //$NON-NLS-1$
+			"IASTParameterDeclaration.DECL_SPECIFIER - IASTDeclSpecifier for IASTParameterDeclaration"); //$NON-NLS-1$
 
 	/**
 	 * <code>DECLARATOR</code> represents the relationship between an
@@ -35,7 +35,7 @@ public interface IASTParameterDeclaration extends IASTNode {
 	 * <code>IASTDeclarator</code>.
 	 */
 	public static final ASTNodeProperty DECLARATOR = new ASTNodeProperty(
-			"Declarator"); //$NON-NLS-1$
+			"IASTParameterDeclaration.DECLARATOR - IASTDeclarator for IASTParameterDeclaration"); //$NON-NLS-1$
 
 	/**
 	 * Get the decl specifier.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorFunctionStyleMacroDefinition.java

@@ -24,7 +24,7 @@ public interface IASTPreprocessorFunctionStyleMacroDefinition extends
 	 * definition and one of its parameters.
 	 */
 	public static final ASTNodeProperty PARAMETER = new ASTNodeProperty(
-			"Function Macro Parameter"); //$NON-NLS-1$
+			"IASTPreprocessorFunctionStyleMacroDefinition.PARAMETER - Function Macro Parameter"); //$NON-NLS-1$
 
 	/**
 	 * Get the macro parameters.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java

@@ -23,7 +23,7 @@ public interface IASTPreprocessorMacroDefinition extends
 	 * definition and it's name.
 	 */
 	public static final ASTNodeProperty MACRO_NAME = new ASTNodeProperty(
-			"Macro Name"); //$NON-NLS-1$
+			"IASTPreprocessorMacroDefinition.MACRO_NAME - Macro Name"); //$NON-NLS-1$
 
 	/**
 	 * Get the macro name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemHolder.java

@@ -21,7 +21,7 @@ public interface IASTProblemHolder {
 	 * <code>PROBLEM</code> represents the relationship between a
 	 * <code>IASTProblemHolder</code> and its <code>IASTProblem</code>.
 	 */
-	public static final ASTNodeProperty PROBLEM = new ASTNodeProperty("Problem"); //$NON-NLS-1$
+	public static final ASTNodeProperty PROBLEM = new ASTNodeProperty("IASTProblemHolder.PROBLEM - IASTProblem for IASTProblemHolder"); //$NON-NLS-1$
 
 	/**
 	 * Get the problem.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java

@@ -21,7 +21,7 @@ public interface IASTReturnStatement extends IASTStatement {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty RETURNVALUE = new ASTNodeProperty(
-			"returnValue"); //$NON-NLS-1$
+			"IASTReturnValue.RETURNVALUE - IASTExpression (returnValue) for IASTReturnStatement"); //$NON-NLS-1$
 
 	/**
 	 * This is the optional return value for this function.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java

@@ -24,7 +24,7 @@ public interface IASTSimpleDeclaration extends IASTDeclaration, IASTNode {
 	 * <code>IASTDeclSpecifier</code>.
 	 */
 	public static final ASTNodeProperty DECL_SPECIFIER = new ASTNodeProperty(
-			"Decl Specifier"); //$NON-NLS-1$
+			"IASTSimpleDeclaration.DECL_SPECIFIER - IASTDeclSpecifier for IASTSimpleDeclaration"); //$NON-NLS-1$
 
 	/**
 	 * <code>DECLARATOR</code> represents the relationship between an
@@ -32,7 +32,7 @@ public interface IASTSimpleDeclaration extends IASTDeclaration, IASTNode {
 	 * <code>IASTDeclarator</code>s.
 	 */
 	public static final ASTNodeProperty DECLARATOR = new ASTNodeProperty(
-			"Declarator"); //$NON-NLS-1$
+			"IASTSimpleDeclaration.DECLARATOR - IASTDeclarator for IASTSimpleDeclaration"); //$NON-NLS-1$
 
 	/**
 	 * This returns the object representing the declSpecifiers for this

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStandardFunctionDeclarator.java

@@ -23,7 +23,7 @@ public interface IASTStandardFunctionDeclarator extends IASTFunctionDeclarator {
 	 * <code>IASTParameterDeclaration</code>.
 	 */
 	public final static ASTNodeProperty FUNCTION_PARAMETER = new ASTNodeProperty(
-			"Parameter"); //$NON-NLS-1$
+			"IASTStandardFunctionDeclarator.FUNCTION_PARAMETER - IASTParameterDeclaration for IASTStandardFunctionDeclarator"); //$NON-NLS-1$
 
 	/**
 	 * Gets the parameter declarations for the function

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java

@@ -23,14 +23,14 @@ public interface IASTSwitchStatement extends IASTStatement {
 	 * <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty CONTROLLER = new ASTNodeProperty(
-			"controller"); //$NON-NLS-1$
+			"IASTSwitchStatement.CONTROLLER - IASTExpression (controller) for IASTSwitchExpression"); //$NON-NLS-1$
 
 	/**
 	 * <code>BODY</code> represents the relationship between an
 	 * <code>IASTSwitchStatement</code> and it's nested
 	 * <code>IASTStatement</code>.
 	 */
-	public static final ASTNodeProperty BODY = new ASTNodeProperty("body"); //$NON-NLS-1$
+	public static final ASTNodeProperty BODY = new ASTNodeProperty("IASTSwitchStatement.BODY - IASTStatment (body) for IASTSwitchStatement"); //$NON-NLS-1$
 
 	/**
 	 * This returns the expression which determines which case to take.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java

@@ -22,21 +22,21 @@ public interface IASTTranslationUnit extends IASTNode {
 	 * it's nested <code>IASTDeclaration</code>'s.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned"); //$NON-NLS-1$
+			"IASTTranslationUnit.OWNED_DECLARATION - IASTDeclaration for IASTTranslationUnit"); //$NON-NLS-1$
 
 	/**
 	 * <code>SCANNER_PROBLEM</code> represents the relationship between an <code>IASTTranslationUnit</code> and
 	 * it's nested <code>IASTProblem</code>.
 	 */
 	public static final ASTNodeProperty SCANNER_PROBLEM = new ASTNodeProperty(
-			"Scanner Problem"); //$NON-NLS-1$
+			"IASTTranslationUnit.SCANNER_PROBLEM - IASTProblem (scanner caused) for IASTTranslationUnit"); //$NON-NLS-1$
 
 	/**
 	 * <code>PREPROCESSOR_STATEMENT</code> represents the relationship between an <code>IASTTranslationUnit</code> and
 	 * it's nested <code>IASTPreprocessorStatement</code>.
 	 */
 	public static final ASTNodeProperty PREPROCESSOR_STATEMENT = new ASTNodeProperty(
-			"PP Statement"); //$NON-NLS-1$
+			"IASTTranslationUnit.PREPROCESSOR_STATEMENT - IASTPreprocessorStatement for IASTTranslationUnit"); //$NON-NLS-1$
 
 	/**
 	 * A translation unit contains an ordered sequence of declarations.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java

@@ -24,14 +24,14 @@ public interface IASTTypeId extends IASTNode {
 	 * it's nested <code>IASTDeclSpecifier</code>.
 	 */
 	public static final ASTNodeProperty DECL_SPECIFIER = new ASTNodeProperty(
-			"Decl Specifier"); //$NON-NLS-1$
+			"IASTTypeId.DECL_SPECIFIER - IASTDeclSpecifier for IASTTypeId"); //$NON-NLS-1$
 
 	/**
 	 * <code>ABSTRACT_DECLARATOR</code> represents the relationship between an <code>IASTTypeId</code> and
 	 * it's nested <code>IASTDeclarator</code>.
 	 */
 	public static final ASTNodeProperty ABSTRACT_DECLARATOR = new ASTNodeProperty(
-			"Abstract Declarator"); //$NON-NLS-1$
+			"IASTTypeId.ABSTRACT_DECLARATOR - IASTDeclarator for IASTTypeId"); //$NON-NLS-1$
 
 	/**
 	 * Get the decl specifier.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java

@@ -41,7 +41,7 @@ public interface IASTTypeIdExpression extends IASTExpression {
 	 * <code>TYPEID</code> represents the relationship between an <code>IASTTypeIdExpression</code> and
 	 * it's nested <code>IASTTypeId</code>.
 	 */
-	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("Type Id"); //$NON-NLS-1$
+	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("IASTTypeIdExpression.TYPE_ID - IASTTypeId for IASTTypeIdExpression"); //$NON-NLS-1$
 
 	/**
 	 * Set the type Id.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java

@@ -111,7 +111,7 @@ public interface IASTUnaryExpression extends IASTExpression {
 	 * <code>OPERAND</code> represents the relationship between an <code>IASTUnaryExpression</code> and
 	 * it's nested <code>IASTExpression</code>.
 	 */
-	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("Operand"); //$NON-NLS-1$
+	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("IASTUnaryExpression.OPERAND - IASTExpression (operand) for IASTUnaryExpression"); //$NON-NLS-1$
 
 	/**
 	 * Get the operand.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java

@@ -22,13 +22,13 @@ public interface IASTWhileStatement extends IASTStatement {
 	 * it's nested <code>IASTExpression</code>.
 	 */
 	public static final ASTNodeProperty CONDITIONEXPRESSION = new ASTNodeProperty(
-			"condition"); //$NON-NLS-1$
+			"IASTWhileStatement.CONDITIONEXPRESSION - IASTExpression (condition) for IASTWhileStatement"); //$NON-NLS-1$
 
 	/**
 	 * <code>BODY</code> represents the relationship between an <code>IASTWhileStatement</code> and
 	 * it's nested <code>IASTStatement</code>.
 	 */
-	public static final ASTNodeProperty BODY = new ASTNodeProperty("body"); //$NON-NLS-1$
+	public static final ASTNodeProperty BODY = new ASTNodeProperty("IASTWhileStatement.BODY - IASTStatement (body) for IASTWhileStatement"); //$NON-NLS-1$
 
 	/**
 	 * Get the condition on the while loop

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java

@@ -25,7 +25,7 @@ public interface ICASTArrayDesignator extends ICASTDesignator {
 	 * the designator and the subscript expression.
 	 */
 	public static final ASTNodeProperty SUBSCRIPT_EXPRESSION = new ASTNodeProperty(
-			"Subscript Expression"); //$NON-NLS-1$
+			"ICASTArrayDesignator.SUBSCRIPT_EXPRESSION - relationship between designator and subscript expression"); //$NON-NLS-1$
 
 	/**
 	 * Get the subsript expression.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java

@@ -33,7 +33,7 @@ public interface ICASTDesignatedInitializer extends IASTInitializer {
 	 * <code>ICASTDesignator</code>.
 	 */
 	public static final ASTNodeProperty DESIGNATOR = new ASTNodeProperty(
-			"Designator"); //$NON-NLS-1$
+			"ICASTDesignatedInitializer.DESIGNATOR - relationship between ICASTDesignatedInitializer and ICASTDesignator"); //$NON-NLS-1$
 
 	/**
 	 * Add a designator to this initializer.
@@ -56,7 +56,7 @@ public interface ICASTDesignatedInitializer extends IASTInitializer {
 	 * <code>IASTInitializer</code>.
 	 */
 	public static final ASTNodeProperty OPERAND = new ASTNodeProperty(
-			"RHS Initializer"); //$NON-NLS-1$
+			"ICASTDesignatedInitializer.OPERAND - RHS IASTInitializer for ICASTDesignatedInitializer"); //$NON-NLS-1$
 
 	/**
 	 * Get the nested initializer.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java

@@ -24,7 +24,7 @@ public interface ICASTFieldDesignator extends ICASTDesignator {
 	 * <code>ICASTFieldDesignator</code> and an <code>IASTName</code>.
 	 */
 	public static final ASTNodeProperty FIELD_NAME = new ASTNodeProperty(
-			"Designator Field Name"); //$NON-NLS-1$
+			"ICASTFieldDesignator.FIELD_NAME - ICASTFieldDesignator Field Name"); //$NON-NLS-1$
 
 	/**
 	 * Get the field name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java

@@ -26,7 +26,7 @@ public interface ICASTTypeIdInitializerExpression extends IASTExpression {
 	 * <code>ICASTTypeIdInitializerExpression</code> and
 	 * <code>IASTTypeId</code>.
 	 */
-	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("TypeId"); //$NON-NLS-1$
+	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("ICASTTypeIdInitializerExpression.TYPE_ID - IASTTypeId for ICASTTypeIdInitializerExpression"); //$NON-NLS-1$
 
 	/**
 	 * <code>INITIALIZER</code> represents the relationship between an
@@ -34,7 +34,7 @@ public interface ICASTTypeIdInitializerExpression extends IASTExpression {
 	 * <code>IASTInitializer</code>.
 	 */
 	public static final ASTNodeProperty INITIALIZER = new ASTNodeProperty(
-			"Initializer"); //$NON-NLS-1$
+			"ICASTTypeIdInitializerExpression.INITIALIZER - IASTInitializer for ICASTTypeIdInitializerExpression"); //$NON-NLS-1$
 
 	/**
 	 * Get the type-id.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCatchHandler.java

@@ -31,13 +31,13 @@ public interface ICPPASTCatchHandler extends IASTStatement {
 	 * catch handler.
 	 */
 	public static final ASTNodeProperty DECLARATION = new ASTNodeProperty(
-			"Declaration"); //$NON-NLS-1$
+			"ICPPASTCatchHandler.DECLARATION - Nested declaration within catch handler"); //$NON-NLS-1$
 
 	/**
 	 * <code>CATCH_BODY</code> represents the nested (compound) statement.
 	 */
 	public static final ASTNodeProperty CATCH_BODY = new ASTNodeProperty(
-			"Catch Body"); //$NON-NLS-1$
+			"ICPPASTCatchHandler.CATCH_BODY - Nested compound statement for catch body"); //$NON-NLS-1$
 
 	/**
 	 * Set is catch all handler.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java

@@ -38,13 +38,13 @@ public interface ICPPASTCompositeTypeSpecifier extends
 	 * visibility label "declaration".
 	 */
 	public static final ASTNodeProperty VISIBILITY_LABEL = new ASTNodeProperty(
-			"Visibility Label"); //$NON-NLS-1$
+			"ICPPASTCompositeTypeSpecifier.VISIBILITY_LABEL - Visibility label \"declaration\""); //$NON-NLS-1$
 
 	/**
 	 * <code>BASE_SPECIFIER</code> expresses the subclass role.
 	 */
 	public static final ASTNodeProperty BASE_SPECIFIER = new ASTNodeProperty(
-			"Base Specifier"); //$NON-NLS-1$
+			"ICPPASTCompositeTypeSpecifier.BASE_SPECIFIER - Expresses the subclass role"); //$NON-NLS-1$
 
 	/**
 	 * Base Specifiers are where a class expresses from whom it inherits.
@@ -108,7 +108,7 @@ public interface ICPPASTCompositeTypeSpecifier extends
 		 * <code>NAME</code> is the name of the base class.
 		 */
 		public static final ASTNodeProperty NAME = new ASTNodeProperty(
-				"BaseSpec Name"); //$NON-NLS-1$
+				"ICPPASTBaseSpecifier.NAME - Name of base class"); //$NON-NLS-1$
 
 		/**
 		 * Get the name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java

@@ -30,7 +30,7 @@ public interface ICPPASTConstructorChainInitializer extends IASTNode, IASTNameOw
 	 * initialized.
 	 */
 	public static final ASTNodeProperty MEMBER_ID = new ASTNodeProperty(
-			"Member Initializer Id"); //$NON-NLS-1$
+			"ICPPASTConstructorChainInitializer.MEMBER_ID - Class field name initialized"); //$NON-NLS-1$
 
 	/**
 	 * Get the field name.
@@ -51,7 +51,7 @@ public interface ICPPASTConstructorChainInitializer extends IASTNode, IASTNameOw
 	 * <code>Expression field is being initialized to.</code>
 	 */
 	public static final ASTNodeProperty INITIALIZER = new ASTNodeProperty(
-			"Expression Initializer"); //$NON-NLS-1$
+			"ICPPASTConstructorChainInitializer.INITIALIZER - Expression Field Initializer"); //$NON-NLS-1$
 
 	/**
 	 * Get the initializer value.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java

@@ -26,7 +26,7 @@ public interface ICPPASTConstructorInitializer extends IASTInitializer {
 	 * constructor.
 	 */
 	public static final ASTNodeProperty EXPRESSION = new ASTNodeProperty(
-			"Expression"); //$NON-NLS-1$
+			"ICPPASTConstructorInitializer.EXPRESSION - Expression consumed in constructor"); //$NON-NLS-1$
 
 	/**
 	 * Get the arguments to the constructor.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java

@@ -24,7 +24,7 @@ public interface ICPPASTDeleteExpression extends IASTExpression {
 	 * <code>OPERAND</code> is the expression representing the pointer being
 	 * deleted.
 	 */
-	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("Operand"); //$NON-NLS-1$
+	public static final ASTNodeProperty OPERAND = new ASTNodeProperty("ICPPASTDeleteExpression.OPERAND - Expression of poniter being deleted"); //$NON-NLS-1$
 
 	/**
 	 * Get the operand.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java

@@ -25,7 +25,7 @@ public interface ICPPASTExplicitTemplateInstantiation extends IASTDeclaration {
 	 * declaration that this template refers to.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned Declaration"); //$NON-NLS-1$
+			"ICPPASTExplicitTemplateInstantiation.OWNED_DECLARATION - Role of inner declaration template refers to"); //$NON-NLS-1$
 
 	/**
 	 * Get the owned declaration.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionDeclarator.java

@@ -57,7 +57,7 @@ public interface ICPPASTFunctionDeclarator extends
 	 * exception specification.
 	 */
 	public static final ASTNodeProperty EXCEPTION_TYPEID = new ASTNodeProperty(
-			"Exception TypeId"); //$NON-NLS-1$
+			"ICPPASTFunctionDeclarator.EXCEPTION_TYPEID - TypeId throws in the exception specification"); //$NON-NLS-1$
 
 	/**
 	 * Get the exception specification.
@@ -94,7 +94,7 @@ public interface ICPPASTFunctionDeclarator extends
 	 * chain initializer.
 	 */
 	public static final ASTNodeProperty CONSTRUCTOR_CHAIN_MEMBER = new ASTNodeProperty(
-			"Constructor Chain Member"); //$NON-NLS-1$
+			"ICPPASTFunctionDeclarator.CONSTRUCTOR_CHAIN_MEMBER - Role of a Constructor Chain Initializer"); //$NON-NLS-1$
 
 	/**
 	 * Get constructor chain.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java

@@ -25,7 +25,7 @@ public interface ICPPASTFunctionTryBlockDeclarator extends
 	 * this interface.
 	 */
 	public static final ASTNodeProperty CATCH_HANDLER = new ASTNodeProperty(
-			"Catch Handler"); //$NON-NLS-1$
+			"ICPPASTFunctionTryBlockDeclarator.CATCH_HANDLER - role of an ICPPASTCatchHandler"); //$NON-NLS-1$
 
 	/**
 	 * Add a catch handler.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java

@@ -40,7 +40,7 @@ public interface ICPPASTLinkageSpecification extends IASTDeclaration {
 	 * linkages.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned Declaration"); //$NON-NLS-1$
+			"ICPPASTLinkageSpecification.OWNED_DECLARATION - Owned Declaration role for linkages"); //$NON-NLS-1$
 
 	/**
 	 * Get all of the declarations.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java

@@ -28,14 +28,14 @@ public interface ICPPASTNamespaceAlias extends IASTDeclaration, IASTNameOwner {
 	 * introduced.
 	 */
 	public static final ASTNodeProperty ALIAS_NAME = new ASTNodeProperty(
-			"Alias name"); //$NON-NLS-1$
+			"ICPPASTNamespaceAlias.ALIAS_NAME - New namespace name introduced"); //$NON-NLS-1$
 
 	/**
 	 * <code>MAPPING_NAME</code> represents the pre-existing namespace which
 	 * the new symbol aliases.
 	 */
 	public static final ASTNodeProperty MAPPING_NAME = new ASTNodeProperty(
-			"Mapping name"); //$NON-NLS-1$
+			"ICPPASTNamespaceAlias.MAPPING_NAME - Pre-existing namespace the new symbol aliases"); //$NON-NLS-1$
 
 	/**
 	 * Get the new alias name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceDefinition.java

@@ -28,14 +28,14 @@ public interface ICPPASTNamespaceDefinition extends IASTDeclaration, IASTNameOwn
 	 * declarations.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned"); //$NON-NLS-1$
+			"ICPPASTNamespaceDefinition.OWNED_DECLARATION - Role served by nested declarations"); //$NON-NLS-1$
 
 	/**
 	 * <code>NAMESPACE_NAME</code> is the role served by the name in this
 	 * interface.
 	 */
 	public static final ASTNodeProperty NAMESPACE_NAME = new ASTNodeProperty(
-			"Name"); //$NON-NLS-1$
+			"ICPPASTNamespaceDefinition.NAMESPACE_NAME - Role served by name"); //$NON-NLS-1$
 
 	/**
 	 * Get the name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java

@@ -41,7 +41,7 @@ public interface ICPPASTNewExpression extends IASTExpression {
 	 * where the memory should be allocated.
 	 */
 	public static final ASTNodeProperty NEW_PLACEMENT = new ASTNodeProperty(
-			"New Placement"); //$NON-NLS-1$
+			"ICPPASTNewExpression.NEW_PLACEMENT - Location where memory should be allocated"); //$NON-NLS-1$
 
 	/**
 	 * Get the new placement (optional).
@@ -62,7 +62,7 @@ public interface ICPPASTNewExpression extends IASTExpression {
 	 * <code>NEW_INITIALIZER</code>
 	 */
 	public static final ASTNodeProperty NEW_INITIALIZER = new ASTNodeProperty(
-			"New Initializer"); //$NON-NLS-1$
+			"ICPPASTNewExpression.NEW_INITIALIZER - New Initializer"); //$NON-NLS-1$
 
 	/**
 	 * @return <code>IASTExpression</code>
@@ -78,7 +78,7 @@ public interface ICPPASTNewExpression extends IASTExpression {
 	/**
 	 * TYPE_ID is the type being 'newed'.
 	 */
-	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("Type Id"); //$NON-NLS-1$
+	public static final ASTNodeProperty TYPE_ID = new ASTNodeProperty("ICPPASTNewExpression.TYPE_ID - The type being 'newed'"); //$NON-NLS-1$
 
 	/**
 	 * Get the type Id.
@@ -114,7 +114,7 @@ public interface ICPPASTNewExpression extends IASTExpression {
 	 * Expressions that go inside array brackets.
 	 */
 	public static final ASTNodeProperty NEW_TYPEID_ARRAY_EXPRESSION = new ASTNodeProperty(
-			"Array Size Expression"); //$NON-NLS-1$
+			"ICPPASTNewExpression.NEW_TYPEID_ARRAY_EXPRESSION - Expressions inside array brackets"); //$NON-NLS-1$
 
 	/**
 	 * Get the new array size expressions.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java

@@ -25,7 +25,7 @@ public interface ICPPASTPointerToMember extends IASTPointer, IASTNameOwner {
 	/**
 	 * This property refers to the nested name.
 	 */
-	public static final ASTNodeProperty NAME = new ASTNodeProperty("Name"); //$NON-NLS-1$
+	public static final ASTNodeProperty NAME = new ASTNodeProperty("ICPPASTPointerToMember.NAME - The nested Name"); //$NON-NLS-1$
 
 	/**
 	 * Set the name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java

@@ -25,7 +25,7 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner {
 	 * Each IASTName segment has property being <code>SEGMENT_NAME</code>.
 	 */
 	public static final ASTNodeProperty SEGMENT_NAME = new ASTNodeProperty(
-			"Segment"); //$NON-NLS-1$
+			"ICPPASTQualifiedName.SEGMENT_NAME - An IASTName segment"); //$NON-NLS-1$
 
 	/**
 	 * Add a subname.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java

@@ -104,7 +104,7 @@ public interface ICPPASTSimpleTypeConstructorExpression extends IASTExpression {
 	 * INITIALIZER_VALUE is the value passed into the constructor.
 	 */
 	public static final ASTNodeProperty INITIALIZER_VALUE = new ASTNodeProperty(
-			"Initializer Value"); //$NON-NLS-1$
+			"ICPPASTSimpleTypeConstructorExpression.INITIALIZER_VALUE - Value passed into constructor"); //$NON-NLS-1$
 
 	/**
 	 * Get the initial value.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java

@@ -52,7 +52,7 @@ public interface ICPPASTSimpleTypeTemplateParameter extends
 	 * The parameter name.
 	 */
 	public static final ASTNodeProperty PARAMETER_NAME = new ASTNodeProperty(
-			"Name"); //$NON-NLS-1$
+			"ICPPASTSimpleTypeTemplateParameter.PARAMETER_NAME - The Parameter's Name"); //$NON-NLS-1$
 
 	/**
 	 * Get the name.
@@ -73,7 +73,7 @@ public interface ICPPASTSimpleTypeTemplateParameter extends
 	 * DEFAULT_TYPE is the optional default typeId value
 	 */
 	public static final ASTNodeProperty DEFAULT_TYPE = new ASTNodeProperty(
-			"Default Type"); //$NON-NLS-1$
+			"ICPPASTSimpleTypeTemplateParameter.DEFAULT_TYPE - Optional default TypeId value"); //$NON-NLS-1$
 
 	/**
 	 * Get the default type.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java

@@ -40,7 +40,7 @@ public interface ICPPASTTemplateDeclaration extends IASTDeclaration {
 	 * grammatically.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned Declaration"); //$NON-NLS-1$
+			"ICPPASTTemplateDeclaration.OWNED_DECLARATION - Subdeclaration maintained grammatically"); //$NON-NLS-1$
 
 	/**
 	 * Get templated declaration.
@@ -61,7 +61,7 @@ public interface ICPPASTTemplateDeclaration extends IASTDeclaration {
 	 * <code>PARAMETER</code> is used for template parameters.
 	 */
 	public static final ASTNodeProperty PARAMETER = new ASTNodeProperty(
-			"Template Parameter"); //$NON-NLS-1$
+			"ICPPASTTemplateDeclaration.PARAMETER - Template Parameter"); //$NON-NLS-1$
 
 	/**
 	 * Get template parameters.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java

@@ -26,7 +26,7 @@ public interface ICPPASTTemplateId extends IASTName, IASTNameOwner {
 	 * TEMPLATE_NAME is the IASTName.
 	 */
 	public static final ASTNodeProperty TEMPLATE_NAME = new ASTNodeProperty(
-			"TemplateId Name"); //$NON-NLS-1$
+			"ICPPASTTemplateId.TEMPLATE_NAME - TemplateId Name"); //$NON-NLS-1$
 
 	/**
 	 * Get the name.
@@ -47,7 +47,7 @@ public interface ICPPASTTemplateId extends IASTName, IASTNameOwner {
 	 * TEMPLATE_ID_ARGUMENT = template id argument.
 	 */
 	public static final ASTNodeProperty TEMPLATE_ID_ARGUMENT = new ASTNodeProperty(
-			"TemplateId Arg"); //$NON-NLS-1$
+			"ICPPASTTemplateId.TEMPLATE_ID_ARGUMENT - TemplateId Argument"); //$NON-NLS-1$
 
 	/**
 	 * Constant.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java

@@ -24,7 +24,7 @@ public interface ICPPASTTemplateSpecialization extends IASTDeclaration {
 	 * The declaration that the specialization affects.
 	 */
 	public static final ASTNodeProperty OWNED_DECLARATION = new ASTNodeProperty(
-			"Owned Declaration"); //$NON-NLS-1$
+			"ICPPASTTemplateSpecialization.OWNED_DECLARATION - Declaration that the specialization affects"); //$NON-NLS-1$
 
 	/**
 	 * Get the declaration.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java

@@ -27,7 +27,7 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends
 	 * PARAMETER
 	 */
 	public static final ASTNodeProperty PARAMETER = new ASTNodeProperty(
-			"Template Parameter"); //$NON-NLS-1$
+			"ICPPASTTemplateTypeTemplateParameter.PARAMETER - Template Parameter"); //$NON-NLS-1$
 
 	/**
 	 * Get all template parameters.
@@ -48,7 +48,7 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends
 	 * This parameter's name.
 	 */
 	public static final ASTNodeProperty PARAMETER_NAME = new ASTNodeProperty(
-			"Name"); //$NON-NLS-1$
+			"ICPPASTTemplateTypeTemplateParameter.PARAMETER_NAME - Template Parameter's Name"); //$NON-NLS-1$
 
 	/**
 	 * Get name.
@@ -69,7 +69,7 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends
 	 * DEFAULT_VALUE is an expession.
 	 */
 	public static final ASTNodeProperty DEFAULT_VALUE = new ASTNodeProperty(
-			"Default Value"); //$NON-NLS-1$
+			"ICPPASTTemplateTypeTemplateParameter.DEFAULT_VALUE - Default Value is an expression"); //$NON-NLS-1$
 
 	/**
 	 * Get default value for template type.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java

@@ -26,7 +26,7 @@ public interface ICPPASTTryBlockStatement extends IASTStatement {
 	/**
 	 * <code>BODY</code> is the body of the try block.
 	 */
-	public static final ASTNodeProperty BODY = new ASTNodeProperty("Body"); //$NON-NLS-1$
+	public static final ASTNodeProperty BODY = new ASTNodeProperty("ICPPASTTryBlockStatement.BODY - Body of try block"); //$NON-NLS-1$
 
 	/**
 	 * Set try body.
@@ -47,7 +47,7 @@ public interface ICPPASTTryBlockStatement extends IASTStatement {
 	 * <code>CATCH_HANDLER</code> are the exception catching handlers.
 	 */
 	public static final ASTNodeProperty CATCH_HANDLER = new ASTNodeProperty(
-			"Catch Handler"); //$NON-NLS-1$
+			"ICPPASTTryBlockStatement.CATCH_HANDLER - Exception catching handlers"); //$NON-NLS-1$
 
 	/**
 	 * Add catch handler.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java

@@ -39,7 +39,7 @@ public interface ICPPASTTypenameExpression extends IASTExpression, IASTNameOwner
 	 * <code>TYPENAME</code> is the name of the type.
 	 */
 	public static final ASTNodeProperty TYPENAME = new ASTNodeProperty(
-			"Typename"); //$NON-NLS-1$
+			"ICPPASTTypenameExpression.TYPENAME - The name of the type"); //$NON-NLS-1$
 
 	/**
 	 * Set the name.
@@ -60,7 +60,7 @@ public interface ICPPASTTypenameExpression extends IASTExpression, IASTNameOwner
 	 * <code>INITIAL_VALUE</code> is an expression.
 	 */
 	public static final ASTNodeProperty INITIAL_VALUE = new ASTNodeProperty(
-			"Initial Value"); //$NON-NLS-1$
+			"ICPPASTTypenameExpression.INITIAL_VALUE - Initial Value is an expression"); //$NON-NLS-1$
 
 	/**
 	 * Set initial value.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java

@@ -25,7 +25,7 @@ public interface ICPPASTUsingDeclaration extends IASTDeclaration, IASTNameOwner
 	/**
 	 * <code>NAME</code> is the qualified name brought into scope.
 	 */
-	public static final ASTNodeProperty NAME = new ASTNodeProperty("Name"); //$NON-NLS-1$
+	public static final ASTNodeProperty NAME = new ASTNodeProperty("ICPPASTUsingDeclaration.NAME - Qualified Name brought into scope"); //$NON-NLS-1$
 
 	/**
 	 * Was the typename keyword used?

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java

@@ -31,7 +31,7 @@ public interface ICPPASTUsingDirective extends IASTDeclaration, IASTNameOwner {
 	 * scope.
 	 */
 	public static final ASTNodeProperty QUALIFIED_NAME = new ASTNodeProperty(
-			"Name"); //$NON-NLS-1$
+			"ICPPASTUsingDirective.QUALIFIED_NAME - Name brought into local scope"); //$NON-NLS-1$
 
 	/**
 	 * Get the qualified name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java

@@ -25,7 +25,7 @@ public interface ICPPASTWhileStatement extends IASTWhileStatement {
 	 * In C++ conditions can be declarations w/side effects.
 	 */
 	public static final ASTNodeProperty CONDITIONDECLARATION = new ASTNodeProperty(
-			"initDeclaration"); //$NON-NLS-1$
+			"ICPPASTWhileStatement.CONDITIONDECLARATION - C++ condition/declaration"); //$NON-NLS-1$
 
 	/**
 	 * Get the condition declaration.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java

@@ -27,7 +27,7 @@ public interface IGNUASTCompoundStatementExpression extends IASTExpression {
 	 * <code>IASTCompoundStatement</code>.
 	 */
 	public static final ASTNodeProperty STATEMENT = new ASTNodeProperty(
-			"Statement"); //$NON-NLS-1$
+			"IGNUASTCompoundStatementExpression.STATEMENT - IASTCompoundStatement for IGNUASTCompoundStatementExpression"); //$NON-NLS-1$
 
 	/**
 	 * Get the compound statement.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java

@@ -29,7 +29,7 @@ public interface ICASTKnRFunctionDeclarator extends IASTFunctionDeclarator, IAST
 	 * function definition.
 	 */
 	public static final ASTNodeProperty PARAMETER_NAME = new ASTNodeProperty(
-			"Parameter Name"); //$NON-NLS-1$
+			"ICASTKnRFunctionDeclarator.PARAMETER_NAME - K&R Parameter Name"); //$NON-NLS-1$
 
 	/**
 	 * Overwrite the parameter names. TODO - this should change to add
@@ -51,7 +51,7 @@ public interface ICASTKnRFunctionDeclarator extends IASTFunctionDeclarator, IAST
 	 * K&R function declarator and the full parameter declarations.
 	 */
 	public static final ASTNodeProperty FUNCTION_PARAMETER = new ASTNodeProperty(
-			"Parameter"); //$NON-NLS-1$
+			"ICASTKnRFunctionDeclarator.FUNCTION_PARAMETER - Full K&R Parameter Declaration"); //$NON-NLS-1$
 
 	/**
 	 * Overrwrite the parameter lists.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java

@@ -28,14 +28,14 @@ public interface IGCCASTArrayRangeDesignator extends ICASTDesignator {
 	 * the range of expressions.
 	 */
 	public static final ASTNodeProperty SUBSCRIPT_FLOOR_EXPRESSION = new ASTNodeProperty(
-			"Subscript Floor Expression"); //$NON-NLS-1$
+			"IGCCASTArrayRangeDesignator.SUBSCRIPT_FLOOR_EXPRESSION - lower value in range"); //$NON-NLS-1$
 
 	/**
 	 * <code>SUSBCRIPT_CEILING_EXPRESSION</code> represents the higher value
 	 * in the range of expressions.
 	 */
 	public static final ASTNodeProperty SUBSCRIPT_CEILING_EXPRESSION = new ASTNodeProperty(
-			"Subscript Ceiling Expression"); //$NON-NLS-1$
+			"IGCCASTArrayRangeDesignator.SUBSCRIPT_CEILING_EXPRESSION - higher value in range"); //$NON-NLS-1$
 
 	/**
 	 * Get the floor expression of the range.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java

@@ -47,7 +47,7 @@ public interface IGPPASTSimpleDeclSpecifier extends IGPPASTDeclSpecifier,
 	 * decl spec & the expression for typeof().
 	 */
 	public static final ASTNodeProperty TYPEOF_EXPRESSION = new ASTNodeProperty(
-			"Typeof Expression"); //$NON-NLS-1$
+			"IGPPASTSimpleDeclSpecifier.TYPEOF_EXPRESSION - typeof() Expression"); //$NON-NLS-1$
 
 	/**
 	 * Did we encounter "long long" as a modifier?

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSemantics.java

@@ -106,7 +106,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
  */
 public class CPPSemantics {
 
-    protected static final ASTNodeProperty STRING_LOOKUP_PROPERTY = new ASTNodeProperty("STRING_LOOKUP"); //$NON-NLS-1$
+    protected static final ASTNodeProperty STRING_LOOKUP_PROPERTY = new ASTNodeProperty("CPPSemantics.STRING_LOOKUP_PROPERTY - STRING_LOOKUP"); //$NON-NLS-1$
 	public static final char[] EMPTY_NAME_ARRAY = new char[0];
 	public static final String EMPTY_NAME = ""; //$NON-NLS-1$
 	public static final char[] OPERATOR_ = new char[] {'o','p','e','r','a','t','o','r',' '};  //$NON-NLS-1$