all builds should pass now!
diff --git a/examples/disabled/main.cpp b/examples/disabled/main.cpp
index 1ec0723..bcff424 100644
--- a/examples/disabled/main.cpp
+++ b/examples/disabled/main.cpp
@@ -26,7 +26,7 @@
 
     // overrides
     context.setOption("abort-after", 5);   // stop test execution after 5 failed assertions
-    context.setOption("order_by", "name"); // sort the test cases by their name
+    context.setOption("order-by", "name"); // sort the test cases by their name
 
     int res = context.run(); // run
 
diff --git a/examples/multi_file_example/main.cpp b/examples/multi_file_example/main.cpp
index 5ecfab6..8db48b6 100644
--- a/examples/multi_file_example/main.cpp
+++ b/examples/multi_file_example/main.cpp
@@ -14,7 +14,7 @@
 
     // overrides
     context.setOption("abort-after", 5);   // stop test execution after 5 failed assertions
-    context.setOption("order_by", "name"); // sort the test cases by their name
+    context.setOption("order-by", "name"); // sort the test cases by their name
 
     int res = context.run(); // run
 
diff --git a/examples/separate_headers/main.cpp b/examples/separate_headers/main.cpp
index 68c0799..5da4c16 100644
--- a/examples/separate_headers/main.cpp
+++ b/examples/separate_headers/main.cpp
@@ -12,7 +12,7 @@
     context.applyCommandLine(argc, argv);
 
     // overrides
-    context.setOption("order_by", "name"); // sort the test cases by their name
+    context.setOption("order-by", "name"); // sort the test cases by their name
 
     int res = context.run(); // run
 
diff --git a/examples/separate_headers/test_output/separate_headers.txt b/examples/separate_headers/test_output/separate_headers.txt
index 05d55d4..df4659c 100644
--- a/examples/separate_headers/test_output/separate_headers.txt
+++ b/examples/separate_headers/test_output/separate_headers.txt
@@ -1,12 +1,73 @@
 [doctest] run with "--help" for options
 == TEST CASE ==================================================================
 test.cpp(0)
-trololo<?>
+separate<?>
 
-test.cpp(0) ERROR!
-  CHECK( sizeof(typename T::A) == static_cast<unsigned>(4) )
-with expansion:
-  CHECK( 1 == 4 )
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<?>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<char>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<char>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<double>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<double>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<int>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<int>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<int>
+
+test.cpp(0) MESSAGE!
+  aaa
+
+== TEST CASE ==================================================================
+test.cpp(0)
+separate<int>
+
+test.cpp(0) MESSAGE!
+  aaa
 
 == TEST CASE ==================================================================
 test.cpp(0)
@@ -19,73 +80,12 @@
 
 == TEST CASE ==================================================================
 test.cpp(0)
-separate<int>
+trololo<?>
 
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<char>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<?>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<double>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<int>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<int>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<char>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<?>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<double>
-
-test.cpp(0) MESSAGE!
-  aaa
-
-== TEST CASE ==================================================================
-test.cpp(0)
-separate<int>
-
-test.cpp(0) MESSAGE!
-  aaa
+test.cpp(0) ERROR!
+  CHECK( sizeof(typename T::A) == static_cast<unsigned>(4) )
+with expansion:
+  CHECK( 1 == 4 )
 
 ===============================================================================
 [doctest] test cases:   12 |   10 passed |    2 failed |    0 skipped
diff --git a/examples/user_supplied_main/main.cpp b/examples/user_supplied_main/main.cpp
index 51a46ee..c986dd6 100644
--- a/examples/user_supplied_main/main.cpp
+++ b/examples/user_supplied_main/main.cpp
@@ -11,7 +11,7 @@
     // defaults
     context.addFilter("test-case-exclude", "*math*"); // exclude test cases with "math" in the name
     context.setOption("abort-after", 5);   // stop test execution after 5 failed assertions
-    context.setOption("order_by", "name"); // sort the test cases by their name
+    context.setOption("order-by", "name"); // sort the test cases by their name
 
     context.applyCommandLine(argc, argv);