diff --git a/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedArgumentExpression.cs b/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedArgumentExpression.cs
index 021ff59b63..0751afe1ec 100644
--- a/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedArgumentExpression.cs
+++ b/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedArgumentExpression.cs
@@ -30,9 +30,9 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 		}
 		
-		public NamedArgumentExpression(string identifier, Expression expression)
+		public NamedArgumentExpression(string name, Expression expression)
 		{
-			this.Name = identifier;
+			this.Name = name;
 			this.Expression = expression;
 		}
 		
diff --git a/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedExpression.cs b/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedExpression.cs
index 663e3686d4..92bc993b17 100644
--- a/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedExpression.cs
+++ b/ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedExpression.cs
@@ -40,13 +40,13 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 		}
 		
-		public NamedExpression (string identifier, Expression expression)
+		public NamedExpression (string name, Expression expression)
 		{
-			this.Identifier = identifier;
+			this.Name = name;
 			this.Expression = expression;
 		}
 		
-		public string Identifier {
+		public string Name {
 			get {
 				return GetChildByRole (Roles.Identifier).Name;
 			}
@@ -55,7 +55,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 		
-		public Identifier IdentifierToken {
+		public Identifier NameToken {
 			get {
 				return GetChildByRole (Roles.Identifier);
 			}
@@ -91,7 +91,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
 		{
 			var o = other as NamedExpression;
-			return o != null && MatchString(this.Identifier, o.Identifier) && this.Expression.DoMatch(o.Expression, match);
+			return o != null && MatchString(this.Name, o.Name) && this.Expression.DoMatch(o.Expression, match);
 		}
 	}
 }
diff --git a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
index cd12e6b79f..91a7c54d39 100644
--- a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -927,7 +927,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		public void VisitNamedExpression(NamedExpression namedExpression)
 		{
 			StartNode(namedExpression);
-			namedExpression.IdentifierToken.AcceptVisitor(this);
+			namedExpression.NameToken.AcceptVisitor(this);
 			Space();
 			WriteToken(Roles.Assign);
 			Space();
diff --git a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
index 6b55c1490e..53584eef08 100644
--- a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
@@ -635,7 +635,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			foreach (Expression expr in attribute.Arguments) {
 				NamedExpression ne = expr as NamedExpression;
 				if (ne != null)
-					attr.Arguments.Add(new CodeAttributeArgument(ne.Identifier, Convert(ne.Expression)));
+					attr.Arguments.Add(new CodeAttributeArgument(ne.Name, Convert(ne.Expression)));
 				else
 					attr.Arguments.Add(new CodeAttributeArgument(Convert(expr)));
 			}
diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs b/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
index e717a32760..ce8201d7f9 100644
--- a/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
+++ b/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this
 // software and associated documentation files (the "Software"), to deal in the Software
@@ -535,7 +535,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				
 				NamedExpression ne = node as NamedExpression;
 				if (ne != null)
-					return ne.Identifier == searchTerm;
+					return ne.Name == searchTerm;
 				
 				return false;
 			}
diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
index 650aeec418..8ef95ac65a 100644
--- a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
@@ -962,7 +962,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			if (expr is NamedExpression) {
 				var namedArgExpr = (NamedExpression)expr;
 				resolveExpr = namedArgExpr.Expression;
-				return namedArgExpr.Identifier;
+				return namedArgExpr.Name;
 			}
 			// no name given, so it's a projection initializer
 			if (expr is MemberReferenceExpression) {
@@ -1287,7 +1287,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			StoreCurrentState(namedExpression);
 			Expression rhs = namedExpression.Expression;
-			ResolveResult lhsRR = resolver.ResolveIdentifierInObjectInitializer(namedExpression.Identifier);
+			ResolveResult lhsRR = resolver.ResolveIdentifierInObjectInitializer(namedExpression.Name);
 			if (rhs is ArrayInitializerExpression) {
 				HandleObjectInitializer(lhsRR, (ArrayInitializerExpression)rhs, initializerStatements);
 			} else {
diff --git a/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs b/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
index 6784a0281b..d9298daf36 100644
--- a/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
@@ -900,7 +900,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 				} else {
 					NamedExpression namedExpression = expr as NamedExpression;
 					if (namedExpression != null) {
-						string name = namedExpression.Identifier;
+						string name = namedExpression.Name;
 						if (namedArguments == null)
 							namedArguments = new List<KeyValuePair<string, IConstantValue>>();
 						namedArguments.Add(new KeyValuePair<string, IConstantValue>(name, ConvertAttributeArgument(namedExpression.Expression)));
diff --git a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
index aa8ace1aec..4e9be8d8b1 100644
--- a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
+++ b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
@@ -430,7 +430,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors
 		{
 			Expression expr = new FieldInitializerExpression {
 				IsKey = true,
-				Identifier = namedExpression.Identifier,
+				Identifier = namedExpression.Name,
 				Expression = (Expression)namedExpression.Expression.AcceptVisitor(this, data)
 			};
 			return EndNode(namedExpression, expr);