diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index b84b958..2264bca 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1768,7 +1768,7 @@
 //===----------------------------------------------------------------------===//
 
 /// typesAreBlockCompatible - This routine is called when comparing two
-/// closure types. Types must be strictly compatible here.
+/// block types. Types must be strictly compatible here.
 bool ASTContext::typesAreBlockCompatible(QualType lhs, QualType rhs) {
   if (lhs.getCVRQualifiers() != rhs.getCVRQualifiers())
     return false;
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 1ab2220..f72ff4f 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -282,7 +282,7 @@
     InitExprs.push_back(initexprs[i]);
 }
 
-/// getFunctionType - Return the underlying function type for this closure.
+/// getFunctionType - Return the underlying function type for this block.
 ///
 const FunctionType *BlockExpr::getFunctionType() const {
   return getType()->getAsBlockPointerType()->
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 320f3ac..ce749e3 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -817,15 +817,15 @@
     /// c/v/r qualifiers, which we accept as an extension.
     CompatiblePointerDiscardsQualifiers,
 
-    /// IntToBlockPointer - The assignment converts an int to a closure 
+    /// IntToBlockPointer - The assignment converts an int to a block 
     /// pointer. We disallow this.
     IntToBlockPointer,
 
-    /// IncompatibleBlockPointer - The assignment is between two closure 
+    /// IncompatibleBlockPointer - The assignment is between two block 
     /// pointers types that are not compatible.
     IncompatibleBlockPointer,
     
-    /// BlockVoidPointer - The assignment is between a closure pointer and
+    /// BlockVoidPointer - The assignment is between a block pointer and
     /// void*, we accept for now.
     BlockVoidPointer,