diff --git a/tests/float/test_float2.models.expected b/tests/float/test_float2.default.expected
similarity index 100%
rename from tests/float/test_float2.models.expected
rename to tests/float/test_float2.default.expected
diff --git a/tests/float/test_float2.models.smt2 b/tests/float/test_float2.default.smt2
similarity index 100%
rename from tests/float/test_float2.models.smt2
rename to tests/float/test_float2.default.smt2
diff --git a/tests/issues/issue1024.err.expected b/tests/issues/1024.err.default.expected
similarity index 100%
rename from tests/issues/issue1024.err.expected
rename to tests/issues/1024.err.default.expected
diff --git a/tests/issues/issue1024.err.smt2 b/tests/issues/1024.err.default.smt2
similarity index 100%
rename from tests/issues/issue1024.err.smt2
rename to tests/issues/1024.err.default.smt2
diff --git a/tests/issues/1163.models.expected b/tests/issues/1163.default.expected
similarity index 100%
rename from tests/issues/1163.models.expected
rename to tests/issues/1163.default.expected
diff --git a/tests/issues/1163.models.smt2 b/tests/issues/1163.default.smt2
similarity index 100%
rename from tests/issues/1163.models.smt2
rename to tests/issues/1163.default.smt2
diff --git a/tests/issues/555.models.expected b/tests/issues/555.default.expected
similarity index 100%
rename from tests/issues/555.models.expected
rename to tests/issues/555.default.expected
diff --git a/tests/issues/555.models.smt2 b/tests/issues/555.default.smt2
similarity index 100%
rename from tests/issues/555.models.smt2
rename to tests/issues/555.default.smt2
diff --git a/tests/issues/777.models.expected b/tests/issues/777.default.expected
similarity index 100%
rename from tests/issues/777.models.expected
rename to tests/issues/777.default.expected
diff --git a/tests/issues/777.models.smt2 b/tests/issues/777.default.smt2
similarity index 100%
rename from tests/issues/777.models.smt2
rename to tests/issues/777.default.smt2
diff --git a/tests/issues/854/function.models.expected b/tests/issues/854/function.default.expected
similarity index 100%
rename from tests/issues/854/function.models.expected
rename to tests/issues/854/function.default.expected
diff --git a/tests/issues/854/function.models.smt2 b/tests/issues/854/function.default.smt2
similarity index 100%
rename from tests/issues/854/function.models.smt2
rename to tests/issues/854/function.default.smt2
diff --git a/tests/issues/854/original.models.expected b/tests/issues/854/original.default.expected
similarity index 100%
rename from tests/issues/854/original.models.expected
rename to tests/issues/854/original.default.expected
diff --git a/tests/issues/854/original.models.smt2 b/tests/issues/854/original.default.smt2
similarity index 100%
rename from tests/issues/854/original.models.smt2
rename to tests/issues/854/original.default.smt2
diff --git a/tests/issues/854/twice_eq.models.expected b/tests/issues/854/twice_eq.default.expected
similarity index 100%
rename from tests/issues/854/twice_eq.models.expected
rename to tests/issues/854/twice_eq.default.expected
diff --git a/tests/issues/854/twice_eq.models.smt2 b/tests/issues/854/twice_eq.default.smt2
similarity index 100%
rename from tests/issues/854/twice_eq.models.smt2
rename to tests/issues/854/twice_eq.default.smt2
diff --git a/tests/issues/926.models.expected b/tests/issues/926.default.expected
similarity index 100%
rename from tests/issues/926.models.expected
rename to tests/issues/926.default.expected
diff --git a/tests/issues/926.models.smt2 b/tests/issues/926.default.smt2
similarity index 100%
rename from tests/issues/926.models.smt2
rename to tests/issues/926.default.smt2
diff --git a/tests/quantifiers/testfile-trigger001.expected b/tests/quantifiers/testfile-trigger001.default.expected
similarity index 100%
rename from tests/quantifiers/testfile-trigger001.expected
rename to tests/quantifiers/testfile-trigger001.default.expected
diff --git a/tests/quantifiers/testfile-trigger001.smt2 b/tests/quantifiers/testfile-trigger001.default.smt2
similarity index 100%
rename from tests/quantifiers/testfile-trigger001.smt2
rename to tests/quantifiers/testfile-trigger001.default.smt2
diff --git a/tests/quantifiers/testfile-trigger002.ae b/tests/quantifiers/testfile-trigger002.default.ae
similarity index 100%
rename from tests/quantifiers/testfile-trigger002.ae
rename to tests/quantifiers/testfile-trigger002.default.ae
diff --git a/tests/quantifiers/testfile-trigger002.expected b/tests/quantifiers/testfile-trigger002.default.expected
similarity index 100%
rename from tests/quantifiers/testfile-trigger002.expected
rename to tests/quantifiers/testfile-trigger002.default.expected
diff --git a/tests/smtlib/testfile-declare-datatype-incremental.expected b/tests/smtlib/testfile-declare-datatype-incremental.default.expected
similarity index 100%
rename from tests/smtlib/testfile-declare-datatype-incremental.expected
rename to tests/smtlib/testfile-declare-datatype-incremental.default.expected
diff --git a/tests/smtlib/testfile-declare-datatype-incremental.smt2 b/tests/smtlib/testfile-declare-datatype-incremental.default.smt2
similarity index 100%
rename from tests/smtlib/testfile-declare-datatype-incremental.smt2
rename to tests/smtlib/testfile-declare-datatype-incremental.default.smt2
diff --git a/tests/smtlib/testfile-get-info1.expected b/tests/smtlib/testfile-get-info1.default.expected
similarity index 100%
rename from tests/smtlib/testfile-get-info1.expected
rename to tests/smtlib/testfile-get-info1.default.expected
diff --git a/tests/smtlib/testfile-get-info1.smt2 b/tests/smtlib/testfile-get-info1.default.smt2
similarity index 100%
rename from tests/smtlib/testfile-get-info1.smt2
rename to tests/smtlib/testfile-get-info1.default.smt2
diff --git a/tests/smtlib/testfile-push-pop1.err.expected b/tests/smtlib/testfile-push-pop1.err.default.expected
similarity index 100%
rename from tests/smtlib/testfile-push-pop1.err.expected
rename to tests/smtlib/testfile-push-pop1.err.default.expected
diff --git a/tests/smtlib/testfile-push-pop1.err.smt2 b/tests/smtlib/testfile-push-pop1.err.default.smt2
similarity index 100%
rename from tests/smtlib/testfile-push-pop1.err.smt2
rename to tests/smtlib/testfile-push-pop1.err.default.smt2
diff --git a/tests/smtlib/testfile-push-pop2.expected b/tests/smtlib/testfile-push-pop2.default.expected
similarity index 100%
rename from tests/smtlib/testfile-push-pop2.expected
rename to tests/smtlib/testfile-push-pop2.default.expected
diff --git a/tests/smtlib/testfile-push-pop2.smt2 b/tests/smtlib/testfile-push-pop2.default.smt2
similarity index 100%
rename from tests/smtlib/testfile-push-pop2.smt2
rename to tests/smtlib/testfile-push-pop2.default.smt2
diff --git a/tests/smtlib/testfile-steps-bound2.expected b/tests/smtlib/testfile-steps-bound2.default.expected
similarity index 100%
rename from tests/smtlib/testfile-steps-bound2.expected
rename to tests/smtlib/testfile-steps-bound2.default.expected
diff --git a/tests/smtlib/testfile-steps-bound2.smt2 b/tests/smtlib/testfile-steps-bound2.default.smt2
similarity index 100%
rename from tests/smtlib/testfile-steps-bound2.smt2
rename to tests/smtlib/testfile-steps-bound2.default.smt2
diff --git a/tools/gentest.ml b/tools/gentest.ml
index ce1ec158af..b6e20987a1 100644
--- a/tools/gentest.ml
+++ b/tools/gentest.ml
@@ -262,7 +262,7 @@ end = struct
                 {acc with accepted_exit_codes = [1]}
               | "timeout" ->
                 {acc with accepted_exit_codes = [142]}
-              | "models" ->
+              | "default" ->
                 {acc with filters = Some ["default"]}
               | _ -> acc
           )