diff --git a/infer/tests/codetoanalyze/cpp/errors/issues.exp b/infer/tests/codetoanalyze/cpp/errors/issues.exp
index e98372871..aaa7f0bca 100644
--- a/infer/tests/codetoanalyze/cpp/errors/issues.exp
+++ b/infer/tests/codetoanalyze/cpp/errors/issues.exp
@@ -76,8 +76,8 @@ codetoanalyze/cpp/errors/npe/npe_added_to_b1.cpp, npe_added_to_b1::causes_npe, 2
 codetoanalyze/cpp/errors/npe/npe_added_to_b1.cpp, npe_added_to_b1::causes_npe_person, 2, NULL_DEREFERENCE, [start of procedure npe_added_to_b1::causes_npe_person(),start of procedure Person,return from a call to npe_added_to_b1::Person_Person,start of procedure npe_added_to_b1::deref_person()]
 codetoanalyze/cpp/errors/npe/null_returned_by_method.cpp, testNullDeref, 3, NULL_DEREFERENCE, [start of procedure testNullDeref(),Condition is true,start of procedure getNull,return from a call to XFactory_getNull]
 codetoanalyze/cpp/errors/npe/object_deref.cpp, object_deref::derefNullField, 2, NULL_DEREFERENCE, [start of procedure object_deref::derefNullField(),start of procedure object_deref::getNull(),return from a call to object_deref::getNull]
-codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp, skip_then_split_case, 5, NULL_DEREFERENCE, [start of procedure skip_then_split_case(),Skipping std::make_shared<lol>(): function or method not found,Skipping skip_no_const(): function or method not found,start of procedure test_pointer(),Condition is false,return from a call to test_pointer]
-codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp, typedef_skip_then_split_case, 4, NULL_DEREFERENCE, [start of procedure typedef_skip_then_split_case(),Skipping std::make_shared<lol>(): function or method not found,Skipping skip_typedef(): function or method not found,start of procedure test_pointer(),Condition is false,return from a call to test_pointer]
+codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp, FP_typedef_skip_then_split_case_ok, 4, NULL_DEREFERENCE, [start of procedure FP_typedef_skip_then_split_case_ok(),Skipping std::make_shared<lol>(): function or method not found,Skipping skip_typedef(): function or method not found,start of procedure test_pointer(),Condition is false,return from a call to test_pointer]
+codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp, skip_then_split_case_bad, 5, NULL_DEREFERENCE, [start of procedure skip_then_split_case_bad(),Skipping std::make_shared<lol>(): function or method not found,Skipping skip_no_const(): function or method not found,start of procedure test_pointer(),Condition is false,return from a call to test_pointer]
 codetoanalyze/cpp/errors/numeric/min_max.cpp, max_X_inv_div0, 2, DIVIDE_BY_ZERO, [start of procedure max_X_inv_div0(),start of procedure X_inv,return from a call to X_inv_X_inv,start of procedure X_inv,return from a call to X_inv_X_inv]
 codetoanalyze/cpp/errors/numeric/min_max.cpp, max_int_div0, 0, DIVIDE_BY_ZERO, [start of procedure max_int_div0()]
 codetoanalyze/cpp/errors/numeric/min_max.cpp, min_X_div0, 2, DIVIDE_BY_ZERO, [start of procedure min_X_div0(),start of procedure X,return from a call to X_X,start of procedure X,return from a call to X_X]
diff --git a/infer/tests/codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp b/infer/tests/codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp
index 063a8ee1a..037369b2c 100644
--- a/infer/tests/codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp
+++ b/infer/tests/codetoanalyze/cpp/errors/npe/skip_function_with_const_formals.cpp
@@ -27,7 +27,7 @@ void test_pointer(const std::shared_ptr<lol>& foo) {
   }
 }
 
-void skip_then_split_case() {
+void skip_then_split_case_bad() {
   auto foo = std::make_shared<lol>();
   skip_no_const(foo); // Infer havocs foo here since it's not const
   test_pointer(
@@ -35,7 +35,7 @@ void skip_then_split_case() {
   foo->f = 12; // error
 }
 
-void const_skip_then_split_case() {
+void const_skip_then_split_case_ok() {
   auto foo = std::make_shared<lol>();
   skip_const(foo); // Infer shouldn't havoc foo here since it's const...
   test_pointer(foo); /* ...so foo cannot be null here, even if there is an
@@ -44,7 +44,7 @@ void const_skip_then_split_case() {
 }
 
 // same as above but make sure infer pinpoints the correct const argument
-void const_skip2_then_split_case() {
+void const_skip2_then_split_case_ok() {
   auto foo = std::make_shared<lol>();
   skip_const2(0, foo, 0, 0);
   test_pointer(foo);
@@ -52,7 +52,7 @@ void const_skip2_then_split_case() {
 }
 
 // same as above but hide the type under a typedef
-void typedef_skip_then_split_case() {
+void FP_typedef_skip_then_split_case_ok() {
   auto foo = std::make_shared<lol>();
   skip_typedef(foo);
   test_pointer(foo);