diff --git a/clang/lib/Analysis/GRSimpleVals.cpp b/clang/lib/Analysis/GRSimpleVals.cpp
index 7d7afe3..860a786 100644
--- a/clang/lib/Analysis/GRSimpleVals.cpp
+++ b/clang/lib/Analysis/GRSimpleVals.cpp
@@ -354,11 +354,11 @@
   ASTContext& Ctx = Eng.getContext();
   ValueStateManager* VMgr = &Eng.getStateManager();
 
-  GRSimpleAPICheck* Check = CreateBasicObjCFoundationChecks(Ctx, VMgr);  
-  Eng.AddObjCMessageExprCheck(Check);
+  GRSimpleAPICheck* Check = CreateBasicObjCFoundationChecks(Ctx, VMgr);
+  Eng.AddCheck(Check, Stmt::ObjCMessageExprClass);
   
-  Check = CreateAuditCFNumberCreate(Ctx, VMgr);  
-  Eng.AddCallCheck(Check);
+  Check = CreateAuditCFNumberCreate(Ctx, VMgr);
+  Eng.AddCheck(Check, Stmt::CallExprClass);
   
 }