diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift b/test/SourceKit/CodeComplete/complete_typerelation.swift
index 2e3856a7fce75..1c9e9e25eb427 100644
--- a/test/SourceKit/CodeComplete/complete_typerelation.swift
+++ b/test/SourceKit/CodeComplete/complete_typerelation.swift
@@ -5,10 +5,10 @@ enum MyEnum : MyProto {
 
     static func staticReturnVoid() {}
     static func staticReturnMyEnum() -> MyEnum { return .foo }
-    func intanceReturnVoid() {}
-    func intanceReturnMyEnum() -> MyEnum { return .foo }
+    func instanceReturnVoid() {}
+    func instanceReturnMyEnum() -> MyEnum { return .foo }
     @available(*, deprecated)
-    func intanceReturnVoidDeprecated() {}
+    func instanceReturnVoidDeprecated() {}
 }
 
 func testIdenticalContext() -> MyEnum {
diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response
index 1ae93e005e752..9afb988027ecf 100644
--- a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response
+++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response
@@ -26,40 +26,40 @@
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnMyEnum(:)",
-      key.description: "intanceReturnMyEnum(self: MyEnum)",
+      key.name: "instanceReturnMyEnum(:)",
+      key.description: "instanceReturnMyEnum(self: MyEnum)",
       key.typename: "() -> MyEnum",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.unrelated,
       key.num_bytes_to_erase: 0,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO013intanceReturncD0ACyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO014instanceReturncD0ACyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnVoid(:)",
-      key.description: "intanceReturnVoid(self: MyEnum)",
+      key.name: "instanceReturnVoid(:)",
+      key.description: "instanceReturnVoid(self: MyEnum)",
       key.typename: "() -> Void",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.invalid,
       key.num_bytes_to_erase: 0,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO17intanceReturnVoidyyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO18instanceReturnVoidyyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnVoid(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnVoidDeprecated(:)",
-      key.description: "intanceReturnVoidDeprecated(self: MyEnum)",
+      key.name: "instanceReturnVoidDeprecated(:)",
+      key.description: "instanceReturnVoidDeprecated(self: MyEnum)",
       key.typename: "() -> Void",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.invalid,
       key.num_bytes_to_erase: 0,
       key.not_recommended: 1,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO27intanceReturnVoidDeprecatedyyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO28instanceReturnVoidDeprecatedyyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.keyword,
diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response
index 1ae93e005e752..9afb988027ecf 100644
--- a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response
+++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response
@@ -26,40 +26,40 @@
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnMyEnum(:)",
-      key.description: "intanceReturnMyEnum(self: MyEnum)",
+      key.name: "instanceReturnMyEnum(:)",
+      key.description: "instanceReturnMyEnum(self: MyEnum)",
       key.typename: "() -> MyEnum",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.unrelated,
       key.num_bytes_to_erase: 0,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO013intanceReturncD0ACyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO014instanceReturncD0ACyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnVoid(:)",
-      key.description: "intanceReturnVoid(self: MyEnum)",
+      key.name: "instanceReturnVoid(:)",
+      key.description: "instanceReturnVoid(self: MyEnum)",
       key.typename: "() -> Void",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.invalid,
       key.num_bytes_to_erase: 0,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO17intanceReturnVoidyyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO18instanceReturnVoidyyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnVoid(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.decl.function.method.instance,
-      key.name: "intanceReturnVoidDeprecated(:)",
-      key.description: "intanceReturnVoidDeprecated(self: MyEnum)",
+      key.name: "instanceReturnVoidDeprecated(:)",
+      key.description: "instanceReturnVoidDeprecated(self: MyEnum)",
       key.typename: "() -> Void",
       key.context: source.codecompletion.context.thisclass,
       key.typerelation: source.codecompletion.typerelation.invalid,
       key.num_bytes_to_erase: 0,
       key.not_recommended: 1,
-      key.associated_usrs: "s:21complete_typerelation6MyEnumO27intanceReturnVoidDeprecatedyyF",
+      key.associated_usrs: "s:21complete_typerelation6MyEnumO28instanceReturnVoidDeprecatedyyF",
       key.modulename: "complete_typerelation",
-      key.sourcetext: "intanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)"
+      key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)"
     },
     {
       key.kind: source.lang.swift.keyword,
diff --git a/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift b/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift
index 4a20e8d69d1ee..b1109a32254f7 100644
--- a/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift
+++ b/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift
@@ -1,6 +1,6 @@
 // RUN: %sourcekitd-test -req=expand-placeholder %s | %FileCheck %s
 
-// FIXME: Make it acccept '-debug-forbid-typecheck-prefix' and ensure no typecheck happens.'
+// FIXME: Make it accept '-debug-forbid-typecheck-prefix' and ensure no typecheck happens.'
 
 protocol MyProto {}
 
diff --git a/test/SourceKit/InterfaceGen/error_swift_module.swift b/test/SourceKit/InterfaceGen/error_swift_module.swift
index 61ab865b16d58..f8175d5767ebf 100644
--- a/test/SourceKit/InterfaceGen/error_swift_module.swift
+++ b/test/SourceKit/InterfaceGen/error_swift_module.swift
@@ -13,9 +13,9 @@ import Transitive
 
 import WrongName
 
-//--- LibraryNonExistant.swift
+//--- LibraryNonExistent.swift
 
-import NonExistant
+import NonExistent
 
 // RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name Transitive -o %t/WrongName.swiftmodule
 // RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name Transitive -o %t/Transitive.swiftmodule
@@ -45,14 +45,14 @@ import NonExistant
 // RUN: not %sourcekitd-test -req=interface-gen -module LibraryWrong -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-FAIL %s
 // TRANSITIVE-FAIL: Could not load module: LibraryWrong (cannot load module 'Transitive' as 'WrongName')
 
-// Try a non-existant module
+// Try a non-existent module
 
-// RUN: not %sourcekitd-test -req=interface-gen -module NonExistant -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix DIRECT-NONEXISTANT %s
-// DIRECT-NONEXISTANT: Could not load module: NonExistant
+// RUN: not %sourcekitd-test -req=interface-gen -module NonExistent -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix DIRECT-NONEXISTENT %s
+// DIRECT-NONEXISTENT: Could not load module: NonExistent
 
-// RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name NonExistant -o %t
-// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistant.swift -module-name LibraryNonExistant -I %t -o %t
-// RUN: rm -rf %t/NonExistant.swiftmodule
+// RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name NonExistent -o %t
+// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistent.swift -module-name LibraryNonExistent -I %t -o %t
+// RUN: rm -rf %t/NonExistent.swiftmodule
 
-// RUN: not %sourcekitd-test -req=interface-gen -module LibraryNonExistant -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-NONEXISTANT %s
-// TRANSITIVE-NONEXISTANT: Could not load module: LibraryNonExistant (missing required module 'NonExistant')
+// RUN: not %sourcekitd-test -req=interface-gen -module LibraryNonExistent -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-NONEXISTENT %s
+// TRANSITIVE-NONEXISTENT: Could not load module: LibraryNonExistent (missing required module 'NonExistent')