diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
index 8155ffe459..9ade41803a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
@@ -123,7 +123,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return resolver.GetConversion(expression, cancellationToken);
 		}
 		
-		public TypeSystemAstBuilder CreateTypeSytemAstBuilder(AstNode node)
+		public TypeSystemAstBuilder CreateTypeSystemAstBuilder(AstNode node)
 		{
 			var csResolver = resolver.GetResolverStateBefore(node);
 			return new TypeSystemAstBuilder(csResolver);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
index ce97fbabd8..f05177b93a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
@@ -126,7 +126,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					AddIssue (binaryOperatorExpression, ctx.TranslateString ("Compare a difference with EPSILON"),
 						script => {
 							// Math.Abs(diff) op EPSILON
-							var builder = ctx.CreateTypeSytemAstBuilder(binaryOperatorExpression);
+							var builder = ctx.CreateTypeSystemAstBuilder(binaryOperatorExpression);
 							var diff = new BinaryOperatorExpression (binaryOperatorExpression.Left.Clone (),
 								BinaryOperatorType.Subtract, binaryOperatorExpression.Right.Clone ());
 							var abs = builder.ConvertType(new TopLevelTypeName("System", "Math")).Invoke("Abs", diff);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
index c43ee6dd20..5a9cc75248 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
@@ -92,7 +92,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				
 				var foundConversion = conversion.ExplicitConversion(rr, variableType);
 				
-				var builder = ctx.CreateTypeSytemAstBuilder(expression);
+				var builder = ctx.CreateTypeSystemAstBuilder(expression);
 				AstType variableTypeNode = builder.ConvertType(variableType);
 				AstType expressionTypeNode = builder.ConvertType(rr.Type);
 				
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
index 8e447b78e5..77427ec47d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
@@ -96,7 +96,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			
 			void AddArgument(Script script, InvocationExpression invocationExpression, string stringComparison)
 			{
-				var astBuilder = ctx.CreateTypeSytemAstBuilder(invocationExpression);
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(invocationExpression);
 				var newArgument = astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(stringComparison);
 				var copy = (InvocationExpression)invocationExpression.Clone();
 				copy.Arguments.Add(newArgument);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
index 490b8007f2..a73c903eed 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
@@ -104,7 +104,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			CodeAction GetAction(BaseRefactoringContext context, Expression targetExpression,
 			                                   IMember member)
 			{
-				var builder = context.CreateTypeSytemAstBuilder(targetExpression);
+				var builder = context.CreateTypeSystemAstBuilder(targetExpression);
 				var newType = builder.ConvertType(member.DeclaringType);
 				string description = string.Format("{0} '{1}'", context.TranslateString("Use base class"), newType.ToString());
 				return new CodeAction(description, script => {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
index 65ab0ae22f..92a7ed6e23 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
@@ -106,7 +106,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					var validTypes = CreateFieldAction.GetValidTypes (ctx.Resolver, expression).ToList ();
 					if (validTypes.Any (t => t.FullName == "System.Func" && t.TypeParameterCount == 1 + parameters.Count) && validTypes.Any (t => t.FullName == "System.Action")) {
 						if (rr != null && rr.Member.ReturnType.Kind != TypeKind.Void) {
-							var builder = ctx.CreateTypeSytemAstBuilder (expression);
+							var builder = ctx.CreateTypeSystemAstBuilder (expression);
 							var type = builder.ConvertType(new TopLevelTypeName("System", "Func", 1));
 							var args = type.GetChildrenByRole(Roles.TypeArgument);
 							args.Clear ();