diff --git a/lib/cpp_catch2_adapter.rb b/lib/cpp_catch2_adapter.rb
index 1a4d32c5..00a838b4 100644
--- a/lib/cpp_catch2_adapter.rb
+++ b/lib/cpp_catch2_adapter.rb
@@ -1,19 +1,19 @@
-class CppUnitAdapter < TestingFrameworkAdapter
-  COUNT_REGEXP 	      = /in (\d+) test cases/ 
-  FAILURES_REGEXP     = /test cases: (\d+) | (\d+) failed/
-  BOTH_REGEXP		  = /test cases: (\d+) | (\d+) passed | (\d+) failed/
-  ASSERTION_ERROR_REGEXP = /\n(.+) error:(.+); /
+class CppCatch2Adapter < TestingFrameworkAdapter
+  ALL_PASSED_REGEXP   		= /in\s+(\d+)\s+test case/ 
+  COUNT_REGEXP      		  = /test cases:\s+(\d+)/
+  FAILURES_REGEXP     		= / \|\s+(\d+)\s+failed/
+  ASSERTION_ERROR_REGEXP 	= /\n(.+)error:(.+);/  
 
   def self.framework_name
-    'CppUnit'
+    'CppCatch2'
   end
 
   def parse_output(output)
-    if SUCCESS_REGEXP.match(output[:stdout])
+    if ALL_PASSED_REGEXP.match(output[:stdout])
       {count: Regexp.last_match(1).to_i, passed: Regexp.last_match(1).to_i}
     else
-      count = COUNT_REGEXP.match(output[:stdout]).try(:captures).try(:first).try(:to_i) || FAILURES_REGEXP.last_match(0).try(:captures).try(:first).try(:to_i) || SUCCESS_REGEXP.last_match(0).try(:captures).try(:first).try(:to_i) || 0
-      failed = FAILURES_REGEXP.match(1).try(:captures).try(:first).try(:to_i) || BOTH_REGEXP.match(2).try(:captures).try(:first).try(:to_i) || 0
+      count = COUNT_REGEXP.match(output[:stdout]).try(:captures).try(:first).try(:to_i) || 0
+      failed = FAILURES_REGEXP.match(output[:stdout]).try(:captures).try(:first).try(:to_i) || 0
       error_matches = ASSERTION_ERROR_REGEXP.match(output[:stdout]).try(:captures) || []
       {count: count, failed: failed, error_messages: error_matches}
     end