diff --git a/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs b/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
index 34519e64cf..56c7d8ee9f 100644
--- a/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
+++ b/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
@@ -47,7 +47,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Ast
 			string program = "Imports My.Name.Space\n";
 			
 			var clause2 = new MemberImportsClause {
-				Member = new QualifiedType(new QualifiedType(new SimpleType("My"), Identifier.Create ("Name", AstLocation.Empty)), Identifier.Create ("Space", AstLocation.Empty))
+				Member = new QualifiedType(new QualifiedType(new SimpleType("My"), new Identifier ("Name", AstLocation.Empty)), new Identifier ("Space", AstLocation.Empty))
 			};
 			
 			var node = new ImportsStatement();
diff --git a/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs b/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
index 45133bab0a..90be4263a7 100644
--- a/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
+++ b/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
@@ -21,7 +21,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 		
 		public string Name {
 			get { return GetChildByRole (Roles.Identifier).Name; }
-			set { SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty)); }
+			set { SetChildByRole(Roles.Identifier, new Identifier (value, AstLocation.Empty)); }
 		}
 		
 		public AstNodeCollection<AstType> Constraints {
diff --git a/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs b/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
index beea69bf50..5c392a73af 100644
--- a/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
+++ b/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
@@ -30,7 +30,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 				return builder.ToString ();
 			}
 			set {
-				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => Identifier.Create (ident, AstLocation.Empty)));
+				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => new Identifier (ident, AstLocation.Empty)));
 			}
 		}
 		
diff --git a/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs b/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
index 04aeb330e1..eadd4f031f 100644
--- a/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
+++ b/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
@@ -23,7 +23,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 		public string Name {
 			get { return GetChildByRole(Roles.Identifier).Name; }
 			set { 
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, new Identifier (value, AstLocation.Empty));
 			}
 		}
 		
diff --git a/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs b/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
index bfb064a347..116f9918c9 100644
--- a/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
+++ b/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
@@ -24,7 +24,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, new Identifier (value, AstLocation.Empty));
 			}
 		}
 		
diff --git a/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs b/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
index 7914428c44..590671b9c7 100644
--- a/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
+++ b/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // FullTypeName.cs
 //
 // Author:
@@ -44,7 +44,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 		
 		public SimpleType(string identifier, AstLocation location)
 		{
-			SetChildByRole (Roles.Identifier, Identifier.Create (identifier, location));
+			SetChildByRole (Roles.Identifier, new Identifier (identifier, location));
 		}
 		
 		public string Identifier {
@@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.VB.Ast
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, new Identifier (value, AstLocation.Empty));
 			}
 		}
 		
diff --git a/ICSharpCode.NRefactory.VB/Parser/Parser.cs b/ICSharpCode.NRefactory.VB/Parser/Parser.cs
index 530b0fc2d9..aa12c27f37 100644
--- a/ICSharpCode.NRefactory.VB/Parser/Parser.cs
+++ b/ICSharpCode.NRefactory.VB/Parser/Parser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -402,7 +402,7 @@ partial class VBParser
 		while (la.kind == 26) {
 			Get();
 			Identifier();
-			type = new QualifiedType(type, Identifier.Create (t.val, t.Location));
+			type = new QualifiedType(type, new Identifier (t.val, t.Location));
 		}
 	}
 
@@ -445,7 +445,7 @@ partial class VBParser
 		var result = new AliasImportsClause(); NodeStart(result);
 		AstType alias;
 		Identifier();
-		result.Name = Identifier.Create (t.val, t.Location);
+		result.Name = new Identifier (t.val, t.Location);
 		Expect(20);
 		TypeName(out alias);
 		result.Alias = alias;