diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt
index 5b31d33..0d0be06 100644
--- a/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -11,7 +11,6 @@
   BugReporter.cpp
   BugReporterVisitors.cpp
   CFRefCount.cpp
-  CXXExprEngine.cpp
   Checker.cpp
   CheckerContext.cpp
   CheckerHelpers.cpp
@@ -21,6 +20,7 @@
   Environment.cpp
   ExplodedGraph.cpp
   ExprEngine.cpp
+  ExprEngineCXX.cpp
   HTMLDiagnostics.cpp
   MemRegion.cpp
   ObjCMessage.cpp
diff --git a/lib/StaticAnalyzer/Core/CXXExprEngine.cpp b/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
similarity index 99%
rename from lib/StaticAnalyzer/Core/CXXExprEngine.cpp
rename to lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
index 4a90f77..d34afba 100644
--- a/lib/StaticAnalyzer/Core/CXXExprEngine.cpp
+++ b/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
@@ -1,4 +1,4 @@
-//===- GRCXXExprEngine.cpp - C++ expr evaluation engine ---------*- C++ -*-===//
+//===- ExprEngineCXX.cpp - ExprEngine support for C++ -----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //