diff --git a/clang/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp b/clang/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
index 8521c18c5480..24a73cbb238a 100644
--- a/clang/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
+++ b/clang/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
@@ -14,7 +14,7 @@
 #include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
 
 // FIXME: Restructure checker registration.
-#include "Checkers/ExprEngineExperimentalChecks.h"
+#include "Checkers/ExperimentalChecks.h"
 
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/SmallPtrSet.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp b/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
index bab5c77f8c19..a20f995639d2 100644
--- a/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
@@ -30,7 +30,7 @@
 #include "clang/StaticAnalyzer/PathDiagnosticClients.h"
 
 // FIXME: Restructure checker registration.
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "InternalChecks.h"
 
 #include "clang/Basic/FileManager.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
index e0b7e8a100b4..1e715ea862cb 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
 #include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
index a3f4daa3b05c..f11a8c5e1f14 100644
--- a/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
 #include "clang/StaticAnalyzer/PathSensitive/GRState.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.h b/clang/lib/StaticAnalyzer/Checkers/ExperimentalChecks.h
similarity index 92%
rename from clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.h
rename to clang/lib/StaticAnalyzer/Checkers/ExperimentalChecks.h
index f8359d1c5cdd..739d34d833ac 100644
--- a/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.h
+++ b/clang/lib/StaticAnalyzer/Checkers/ExperimentalChecks.h
@@ -1,4 +1,4 @@
-//=-- ExprEngineExperimentalChecks.h ------------------------------*- C++ -*-=
+//=-- ExperimentalChecks.h ----------------------------------------*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp b/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
index 02291bb784f5..606fb359fedd 100644
--- a/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
@@ -1,4 +1,4 @@
-//=-- ExprEngineExperimentalChecks.h ------------------------------*- C++ -*-=
+//=-- ExperimentalChecks.h ----------------------------------------*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "InternalChecks.h"
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
 
 using namespace clang;
diff --git a/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
index ecae79759515..67a8a0bc4182 100644
--- a/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
@@ -42,7 +42,7 @@
 // - Finer grained false positive control (levels)
 // - Handling ~0 values
 
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/Analysis/CFGStmtMap.h"
 #include "clang/Analysis/Analyses/PseudoConstantAnalysis.h"
 #include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
index bd6a227d382d..bd2e1f7c654d 100644
--- a/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
 #include "clang/StaticAnalyzer/PathSensitive/GRState.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
index 7a91696c92cb..0f0cab556202 100644
--- a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
@@ -15,7 +15,7 @@
 #include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
 #include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
 #include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "llvm/ADT/ImmutableSet.h"
 
 using namespace clang;
diff --git a/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
index c394c59cb371..0d160b9b9bd3 100644
--- a/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
 #include "clang/StaticAnalyzer/PathSensitive/GRState.h"
diff --git a/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
index 98834485ebab..5232f2f603a0 100644
--- a/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
@@ -21,7 +21,7 @@
 #include "clang/StaticAnalyzer/PathSensitive/SVals.h"
 #include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
 #include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
-#include "ExprEngineExperimentalChecks.h"
+#include "ExperimentalChecks.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
 // The number of CFGBlock pointers we want to reserve memory for. This is used