diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAliasDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAliasDeclaration.java
index 04e6d5beedf..de89070c552 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAliasDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAliasDeclaration.java
@@ -25,7 +25,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNameOwner;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ICPPASTAliasDeclaration extends IASTDeclaration, IASTNameOwner {
-	public static final ICPPASTAliasDeclaration[] EMPTY_USINGDIRECTIVE_ARRAY = {};
+	public static final ICPPASTAliasDeclaration[] EMPTY_ALIAS_DECLARATION_ARRAY = {};
 
 	/**
 	 * <code>ALIAS_NAME</code> is the name that is brought into local
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
index 6d96e99672f..9f9c639547a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
@@ -24,7 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNameOwner;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ICPPASTUsingDirective extends IASTDeclaration, IASTNameOwner, IASTAttributeOwner {
-	public static final ICPPASTUsingDirective[] EMPTY_USINGDIRECTIVE_ARRAY = new ICPPASTUsingDirective[0];
+	public static final ICPPASTUsingDirective[] EMPTY_USINGDIRECTIVE_ARRAY = {};
 
 	/**
 	 * <code>QUALIFIED_NAME</code> is the name that is brought into local
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
index 50c3a63b530..dbae723aa2f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
@@ -36,7 +36,7 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumera
 
 	@Override
 	public boolean isSameType(IType type) {
-		return ((IEnumeration)rbinding).isSameType(type);
+		return ((IEnumeration) rbinding).isSameType(type);
 	}
 	
 	@Override
@@ -48,17 +48,17 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumera
 	}
 	@Override
 	public long getMinValue() {
-		return ((IEnumeration)rbinding).getMinValue();
+		return ((IEnumeration) rbinding).getMinValue();
 	}
 
 	@Override
 	public long getMaxValue() {
-		return ((IEnumeration)rbinding).getMaxValue();
+		return ((IEnumeration) rbinding).getMaxValue();
 	}
 
 	@Override
 	public boolean isScoped() {
-		return ((ICPPEnumeration)rbinding).isScoped();
+		return ((ICPPEnumeration) rbinding).isScoped();
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
index 51820cbe782..956951914e4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
@@ -25,13 +25,13 @@ class CompositeCPPTypedef extends CompositeCPPBinding implements ITypedef, IInde
 
 	@Override
 	public IType getType() {
-		IType type = ((ITypedef)rbinding).getType();
+		IType type = ((ITypedef) rbinding).getType();
 		return cf.getCompositeType(type);
 	}
 
 	@Override
 	public boolean isSameType(IType type) {
-		return ((ITypedef)rbinding).isSameType(type);
+		return ((ITypedef) rbinding).isSameType(type);
 	}
 
 	@Override