Repository: mozilla/cbindgen (language: rust)

Issue:
Tests fail with Cython 3.0.2
Most of the tests in `tests/tests.rs` fail with this error:
```
thread 'test_union_self' panicked at tests/tests.rs:180:5:
Output failed to compile: Output { status: ExitStatus(unix_wait_status(256)), stdout: "", stderr: "\nError compiling Cython file:\n------------------------------------------------------------\n...\nfrom libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t\n^\n------------------------------------------------------------\n\ntests/expectations/union_self.tag.pyx:1:0: Dotted filenames ('union_self.tag.pyx') are deprecated. Please use the normal Python package directory layout.\n" }

test result: FAILED. 45 passed; 97 failed; 0 ignored; 0 measured; 0 filtered out; finished in 22.62s
```

They do pass on Cython 0.29.36, everything else being the same.


Discussion / hints:

Fix patch:
diff --git a/.github/workflows/cbindgen.yml b/.github/workflows/cbindgen.yml
index bc7a22e2d..13b1d042d 100644
--- a/.github/workflows/cbindgen.yml
+++ b/.github/workflows/cbindgen.yml
@@ -55,7 +55,7 @@ jobs:
     - name: Install Cython
       run: |
         python -m pip install --upgrade pip wheel
-        pip install Cython==0.29.*
+        pip install Cython==3.0.2
 
     - name: Build
       run: |


Test patch:
diff --git a/tests/expectations/alias.both.c b/tests/expectations/alias_both.c
similarity index 100%
rename from tests/expectations/alias.both.c
rename to tests/expectations/alias_both.c
diff --git a/tests/expectations/alias.both.compat.c b/tests/expectations/alias_both.compat.c
similarity index 100%
rename from tests/expectations/alias.both.compat.c
rename to tests/expectations/alias_both.compat.c
diff --git a/tests/expectations/alias.tag.c b/tests/expectations/alias_tag.c
similarity index 100%
rename from tests/expectations/alias.tag.c
rename to tests/expectations/alias_tag.c
diff --git a/tests/expectations/alias.tag.compat.c b/tests/expectations/alias_tag.compat.c
similarity index 100%
rename from tests/expectations/alias.tag.compat.c
rename to tests/expectations/alias_tag.compat.c
diff --git a/tests/expectations/alias.tag.pyx b/tests/expectations/alias_tag.pyx
similarity index 100%
rename from tests/expectations/alias.tag.pyx
rename to tests/expectations/alias_tag.pyx
diff --git a/tests/expectations/annotation.both.c b/tests/expectations/annotation_both.c
similarity index 100%
rename from tests/expectations/annotation.both.c
rename to tests/expectations/annotation_both.c
diff --git a/tests/expectations/annotation.both.compat.c b/tests/expectations/annotation_both.compat.c
similarity index 100%
rename from tests/expectations/annotation.both.compat.c
rename to tests/expectations/annotation_both.compat.c
diff --git a/tests/expectations/annotation.tag.c b/tests/expectations/annotation_tag.c
similarity index 100%
rename from tests/expectations/annotation.tag.c
rename to tests/expectations/annotation_tag.c
diff --git a/tests/expectations/annotation.tag.compat.c b/tests/expectations/annotation_tag.compat.c
similarity index 100%
rename from tests/expectations/annotation.tag.compat.c
rename to tests/expectations/annotation_tag.compat.c
diff --git a/tests/expectations/annotation.tag.pyx b/tests/expectations/annotation_tag.pyx
similarity index 100%
rename from tests/expectations/annotation.tag.pyx
rename to tests/expectations/annotation_tag.pyx
diff --git a/tests/expectations/array.both.c b/tests/expectations/array_both.c
similarity index 100%
rename from tests/expectations/array.both.c
rename to tests/expectations/array_both.c
diff --git a/tests/expectations/array.both.compat.c b/tests/expectations/array_both.compat.c
similarity index 100%
rename from tests/expectations/array.both.compat.c
rename to tests/expectations/array_both.compat.c
diff --git a/tests/expectations/array.tag.c b/tests/expectations/array_tag.c
similarity index 100%
rename from tests/expectations/array.tag.c
rename to tests/expectations/array_tag.c
diff --git a/tests/expectations/array.tag.compat.c b/tests/expectations/array_tag.compat.c
similarity index 100%
rename from tests/expectations/array.tag.compat.c
rename to tests/expectations/array_tag.compat.c
diff --git a/tests/expectations/array.tag.pyx b/tests/expectations/array_tag.pyx
similarity index 100%
rename from tests/expectations/array.tag.pyx
rename to tests/expectations/array_tag.pyx
diff --git a/tests/expectations/asserted_cast.both.c b/tests/expectations/asserted_cast_both.c
similarity index 100%
rename from tests/expectations/asserted_cast.both.c
rename to tests/expectations/asserted_cast_both.c
diff --git a/tests/expectations/asserted_cast.both.compat.c b/tests/expectations/asserted_cast_both.compat.c
similarity index 100%
rename from tests/expectations/asserted_cast.both.compat.c
rename to tests/expectations/asserted_cast_both.compat.c
diff --git a/tests/expectations/asserted_cast.tag.c b/tests/expectations/asserted_cast_tag.c
similarity index 100%
rename from tests/expectations/asserted_cast.tag.c
rename to tests/expectations/asserted_cast_tag.c
diff --git a/tests/expectations/asserted_cast.tag.compat.c b/tests/expectations/asserted_cast_tag.compat.c
similarity index 100%
rename from tests/expectations/asserted_cast.tag.compat.c
rename to tests/expectations/asserted_cast_tag.compat.c
diff --git a/tests/expectations/asserted_cast.tag.pyx b/tests/expectations/asserted_cast_tag.pyx
similarity index 100%
rename from tests/expectations/asserted_cast.tag.pyx
rename to tests/expectations/asserted_cast_tag.pyx
diff --git a/tests/expectations/assoc_constant.both.c b/tests/expectations/assoc_constant_both.c
similarity index 100%
rename from tests/expectations/assoc_constant.both.c
rename to tests/expectations/assoc_constant_both.c
diff --git a/tests/expectations/assoc_constant.both.compat.c b/tests/expectations/assoc_constant_both.compat.c
similarity index 100%
rename from tests/expectations/assoc_constant.both.compat.c
rename to tests/expectations/assoc_constant_both.compat.c
diff --git a/tests/expectations/assoc_constant.tag.c b/tests/expectations/assoc_constant_tag.c
similarity index 100%
rename from tests/expectations/assoc_constant.tag.c
rename to tests/expectations/assoc_constant_tag.c
diff --git a/tests/expectations/assoc_constant.tag.compat.c b/tests/expectations/assoc_constant_tag.compat.c
similarity index 100%
rename from tests/expectations/assoc_constant.tag.compat.c
rename to tests/expectations/assoc_constant_tag.compat.c
diff --git a/tests/expectations/assoc_constant.tag.pyx b/tests/expectations/assoc_constant_tag.pyx
similarity index 100%
rename from tests/expectations/assoc_constant.tag.pyx
rename to tests/expectations/assoc_constant_tag.pyx
diff --git a/tests/expectations/associated_in_body.both.c b/tests/expectations/associated_in_body_both.c
similarity index 100%
rename from tests/expectations/associated_in_body.both.c
rename to tests/expectations/associated_in_body_both.c
diff --git a/tests/expectations/associated_in_body.both.compat.c b/tests/expectations/associated_in_body_both.compat.c
similarity index 100%
rename from tests/expectations/associated_in_body.both.compat.c
rename to tests/expectations/associated_in_body_both.compat.c
diff --git a/tests/expectations/associated_in_body.tag.c b/tests/expectations/associated_in_body_tag.c
similarity index 100%
rename from tests/expectations/associated_in_body.tag.c
rename to tests/expectations/associated_in_body_tag.c
diff --git a/tests/expectations/associated_in_body.tag.compat.c b/tests/expectations/associated_in_body_tag.compat.c
similarity index 100%
rename from tests/expectations/associated_in_body.tag.compat.c
rename to tests/expectations/associated_in_body_tag.compat.c
diff --git a/tests/expectations/associated_in_body.tag.pyx b/tests/expectations/associated_in_body_tag.pyx
similarity index 100%
rename from tests/expectations/associated_in_body.tag.pyx
rename to tests/expectations/associated_in_body_tag.pyx
diff --git a/tests/expectations/bitfield.both.c b/tests/expectations/bitfield_both.c
similarity index 100%
rename from tests/expectations/bitfield.both.c
rename to tests/expectations/bitfield_both.c
diff --git a/tests/expectations/bitfield.both.compat.c b/tests/expectations/bitfield_both.compat.c
similarity index 100%
rename from tests/expectations/bitfield.both.compat.c
rename to tests/expectations/bitfield_both.compat.c
diff --git a/tests/expectations/bitfield.tag.c b/tests/expectations/bitfield_tag.c
similarity index 100%
rename from tests/expectations/bitfield.tag.c
rename to tests/expectations/bitfield_tag.c
diff --git a/tests/expectations/bitfield.tag.compat.c b/tests/expectations/bitfield_tag.compat.c
similarity index 100%
rename from tests/expectations/bitfield.tag.compat.c
rename to tests/expectations/bitfield_tag.compat.c
diff --git a/tests/expectations/bitfield.tag.pyx b/tests/expectations/bitfield_tag.pyx
similarity index 100%
rename from tests/expectations/bitfield.tag.pyx
rename to tests/expectations/bitfield_tag.pyx
diff --git a/tests/expectations/bitflags.both.c b/tests/expectations/bitflags_both.c
similarity index 100%
rename from tests/expectations/bitflags.both.c
rename to tests/expectations/bitflags_both.c
diff --git a/tests/expectations/bitflags.both.compat.c b/tests/expectations/bitflags_both.compat.c
similarity index 100%
rename from tests/expectations/bitflags.both.compat.c
rename to tests/expectations/bitflags_both.compat.c
diff --git a/tests/expectations/bitflags.tag.c b/tests/expectations/bitflags_tag.c
similarity index 100%
rename from tests/expectations/bitflags.tag.c
rename to tests/expectations/bitflags_tag.c
diff --git a/tests/expectations/bitflags.tag.compat.c b/tests/expectations/bitflags_tag.compat.c
similarity index 100%
rename from tests/expectations/bitflags.tag.compat.c
rename to tests/expectations/bitflags_tag.compat.c
diff --git a/tests/expectations/bitflags.tag.pyx b/tests/expectations/bitflags_tag.pyx
similarity index 100%
rename from tests/expectations/bitflags.tag.pyx
rename to tests/expectations/bitflags_tag.pyx
diff --git a/tests/expectations/body.both.c b/tests/expectations/body_both.c
similarity index 100%
rename from tests/expectations/body.both.c
rename to tests/expectations/body_both.c
diff --git a/tests/expectations/body.both.compat.c b/tests/expectations/body_both.compat.c
similarity index 100%
rename from tests/expectations/body.both.compat.c
rename to tests/expectations/body_both.compat.c
diff --git a/tests/expectations/body.tag.c b/tests/expectations/body_tag.c
similarity index 100%
rename from tests/expectations/body.tag.c
rename to tests/expectations/body_tag.c
diff --git a/tests/expectations/body.tag.compat.c b/tests/expectations/body_tag.compat.c
similarity index 100%
rename from tests/expectations/body.tag.compat.c
rename to tests/expectations/body_tag.compat.c
diff --git a/tests/expectations/body.tag.pyx b/tests/expectations/body_tag.pyx
similarity index 100%
rename from tests/expectations/body.tag.pyx
rename to tests/expectations/body_tag.pyx
diff --git a/tests/expectations/box.both.c b/tests/expectations/box_both.c
similarity index 100%
rename from tests/expectations/box.both.c
rename to tests/expectations/box_both.c
diff --git a/tests/expectations/box.both.compat.c b/tests/expectations/box_both.compat.c
similarity index 100%
rename from tests/expectations/box.both.compat.c
rename to tests/expectations/box_both.compat.c
diff --git a/tests/expectations/box.tag.c b/tests/expectations/box_tag.c
similarity index 100%
rename from tests/expectations/box.tag.c
rename to tests/expectations/box_tag.c
diff --git a/tests/expectations/box.tag.compat.c b/tests/expectations/box_tag.compat.c
similarity index 100%
rename from tests/expectations/box.tag.compat.c
rename to tests/expectations/box_tag.compat.c
diff --git a/tests/expectations/box.tag.pyx b/tests/expectations/box_tag.pyx
similarity index 100%
rename from tests/expectations/box.tag.pyx
rename to tests/expectations/box_tag.pyx
diff --git a/tests/expectations/cell.both.c b/tests/expectations/cell_both.c
similarity index 100%
rename from tests/expectations/cell.both.c
rename to tests/expectations/cell_both.c
diff --git a/tests/expectations/cell.both.compat.c b/tests/expectations/cell_both.compat.c
similarity index 100%
rename from tests/expectations/cell.both.compat.c
rename to tests/expectations/cell_both.compat.c
diff --git a/tests/expectations/cell.tag.c b/tests/expectations/cell_tag.c
similarity index 100%
rename from tests/expectations/cell.tag.c
rename to tests/expectations/cell_tag.c
diff --git a/tests/expectations/cell.tag.compat.c b/tests/expectations/cell_tag.compat.c
similarity index 100%
rename from tests/expectations/cell.tag.compat.c
rename to tests/expectations/cell_tag.compat.c
diff --git a/tests/expectations/cell.tag.pyx b/tests/expectations/cell_tag.pyx
similarity index 100%
rename from tests/expectations/cell.tag.pyx
rename to tests/expectations/cell_tag.pyx
diff --git a/tests/expectations/cfg_2.both.c b/tests/expectations/cfg_2_both.c
similarity index 100%
rename from tests/expectations/cfg_2.both.c
rename to tests/expectations/cfg_2_both.c
diff --git a/tests/expectations/cfg_2.both.compat.c b/tests/expectations/cfg_2_both.compat.c
similarity index 100%
rename from tests/expectations/cfg_2.both.compat.c
rename to tests/expectations/cfg_2_both.compat.c
diff --git a/tests/expectations/cfg_2.tag.c b/tests/expectations/cfg_2_tag.c
similarity index 100%
rename from tests/expectations/cfg_2.tag.c
rename to tests/expectations/cfg_2_tag.c
diff --git a/tests/expectations/cfg_2.tag.compat.c b/tests/expectations/cfg_2_tag.compat.c
similarity index 100%
rename from tests/expectations/cfg_2.tag.compat.c
rename to tests/expectations/cfg_2_tag.compat.c
diff --git a/tests/expectations/cfg_2.tag.pyx b/tests/expectations/cfg_2_tag.pyx
similarity index 100%
rename from tests/expectations/cfg_2.tag.pyx
rename to tests/expectations/cfg_2_tag.pyx
diff --git a/tests/expectations/cfg.both.c b/tests/expectations/cfg_both.c
similarity index 100%
rename from tests/expectations/cfg.both.c
rename to tests/expectations/cfg_both.c
diff --git a/tests/expectations/cfg.both.compat.c b/tests/expectations/cfg_both.compat.c
similarity index 100%
rename from tests/expectations/cfg.both.compat.c
rename to tests/expectations/cfg_both.compat.c
diff --git a/tests/expectations/cfg.tag.c b/tests/expectations/cfg_tag.c
similarity index 100%
rename from tests/expectations/cfg.tag.c
rename to tests/expectations/cfg_tag.c
diff --git a/tests/expectations/cfg.tag.compat.c b/tests/expectations/cfg_tag.compat.c
similarity index 100%
rename from tests/expectations/cfg.tag.compat.c
rename to tests/expectations/cfg_tag.compat.c
diff --git a/tests/expectations/cfg.tag.pyx b/tests/expectations/cfg_tag.pyx
similarity index 100%
rename from tests/expectations/cfg.tag.pyx
rename to tests/expectations/cfg_tag.pyx
diff --git a/tests/expectations/char.both.c b/tests/expectations/char_both.c
similarity index 100%
rename from tests/expectations/char.both.c
rename to tests/expectations/char_both.c
diff --git a/tests/expectations/char.both.compat.c b/tests/expectations/char_both.compat.c
similarity index 100%
rename from tests/expectations/char.both.compat.c
rename to tests/expectations/char_both.compat.c
diff --git a/tests/expectations/char.tag.c b/tests/expectations/char_tag.c
similarity index 100%
rename from tests/expectations/char.tag.c
rename to tests/expectations/char_tag.c
diff --git a/tests/expectations/char.tag.compat.c b/tests/expectations/char_tag.compat.c
similarity index 100%
rename from tests/expectations/char.tag.compat.c
rename to tests/expectations/char_tag.compat.c
diff --git a/tests/expectations/char.tag.pyx b/tests/expectations/char_tag.pyx
similarity index 100%
rename from tests/expectations/char.tag.pyx
rename to tests/expectations/char_tag.pyx
diff --git a/tests/expectations/const_generics_arrayvec.both.c b/tests/expectations/const_generics_arrayvec_both.c
similarity index 100%
rename from tests/expectations/const_generics_arrayvec.both.c
rename to tests/expectations/const_generics_arrayvec_both.c
diff --git a/tests/expectations/const_generics_arrayvec.both.compat.c b/tests/expectations/const_generics_arrayvec_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_arrayvec.both.compat.c
rename to tests/expectations/const_generics_arrayvec_both.compat.c
diff --git a/tests/expectations/const_generics_arrayvec.tag.c b/tests/expectations/const_generics_arrayvec_tag.c
similarity index 100%
rename from tests/expectations/const_generics_arrayvec.tag.c
rename to tests/expectations/const_generics_arrayvec_tag.c
diff --git a/tests/expectations/const_generics_arrayvec.tag.compat.c b/tests/expectations/const_generics_arrayvec_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_arrayvec.tag.compat.c
rename to tests/expectations/const_generics_arrayvec_tag.compat.c
diff --git a/tests/expectations/const_generics_arrayvec.tag.pyx b/tests/expectations/const_generics_arrayvec_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_arrayvec.tag.pyx
rename to tests/expectations/const_generics_arrayvec_tag.pyx
diff --git a/tests/expectations/const_generics_bool.both.c b/tests/expectations/const_generics_bool_both.c
similarity index 100%
rename from tests/expectations/const_generics_bool.both.c
rename to tests/expectations/const_generics_bool_both.c
diff --git a/tests/expectations/const_generics_bool.both.compat.c b/tests/expectations/const_generics_bool_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_bool.both.compat.c
rename to tests/expectations/const_generics_bool_both.compat.c
diff --git a/tests/expectations/const_generics_bool.tag.c b/tests/expectations/const_generics_bool_tag.c
similarity index 100%
rename from tests/expectations/const_generics_bool.tag.c
rename to tests/expectations/const_generics_bool_tag.c
diff --git a/tests/expectations/const_generics_bool.tag.compat.c b/tests/expectations/const_generics_bool_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_bool.tag.compat.c
rename to tests/expectations/const_generics_bool_tag.compat.c
diff --git a/tests/expectations/const_generics_bool.tag.pyx b/tests/expectations/const_generics_bool_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_bool.tag.pyx
rename to tests/expectations/const_generics_bool_tag.pyx
diff --git a/tests/expectations/const_generics.both.c b/tests/expectations/const_generics_both.c
similarity index 100%
rename from tests/expectations/const_generics.both.c
rename to tests/expectations/const_generics_both.c
diff --git a/tests/expectations/const_generics.both.compat.c b/tests/expectations/const_generics_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics.both.compat.c
rename to tests/expectations/const_generics_both.compat.c
diff --git a/tests/expectations/const_generics_byte.both.c b/tests/expectations/const_generics_byte_both.c
similarity index 100%
rename from tests/expectations/const_generics_byte.both.c
rename to tests/expectations/const_generics_byte_both.c
diff --git a/tests/expectations/const_generics_byte.both.compat.c b/tests/expectations/const_generics_byte_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_byte.both.compat.c
rename to tests/expectations/const_generics_byte_both.compat.c
diff --git a/tests/expectations/const_generics_byte.tag.c b/tests/expectations/const_generics_byte_tag.c
similarity index 100%
rename from tests/expectations/const_generics_byte.tag.c
rename to tests/expectations/const_generics_byte_tag.c
diff --git a/tests/expectations/const_generics_byte.tag.compat.c b/tests/expectations/const_generics_byte_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_byte.tag.compat.c
rename to tests/expectations/const_generics_byte_tag.compat.c
diff --git a/tests/expectations/const_generics_byte.tag.pyx b/tests/expectations/const_generics_byte_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_byte.tag.pyx
rename to tests/expectations/const_generics_byte_tag.pyx
diff --git a/tests/expectations/const_generics_char.both.c b/tests/expectations/const_generics_char_both.c
similarity index 100%
rename from tests/expectations/const_generics_char.both.c
rename to tests/expectations/const_generics_char_both.c
diff --git a/tests/expectations/const_generics_char.both.compat.c b/tests/expectations/const_generics_char_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_char.both.compat.c
rename to tests/expectations/const_generics_char_both.compat.c
diff --git a/tests/expectations/const_generics_char.tag.c b/tests/expectations/const_generics_char_tag.c
similarity index 100%
rename from tests/expectations/const_generics_char.tag.c
rename to tests/expectations/const_generics_char_tag.c
diff --git a/tests/expectations/const_generics_char.tag.compat.c b/tests/expectations/const_generics_char_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_char.tag.compat.c
rename to tests/expectations/const_generics_char_tag.compat.c
diff --git a/tests/expectations/const_generics_char.tag.pyx b/tests/expectations/const_generics_char_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_char.tag.pyx
rename to tests/expectations/const_generics_char_tag.pyx
diff --git a/tests/expectations/const_generics_constant.both.c b/tests/expectations/const_generics_constant_both.c
similarity index 100%
rename from tests/expectations/const_generics_constant.both.c
rename to tests/expectations/const_generics_constant_both.c
diff --git a/tests/expectations/const_generics_constant.both.compat.c b/tests/expectations/const_generics_constant_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_constant.both.compat.c
rename to tests/expectations/const_generics_constant_both.compat.c
diff --git a/tests/expectations/const_generics_constant.tag.c b/tests/expectations/const_generics_constant_tag.c
similarity index 100%
rename from tests/expectations/const_generics_constant.tag.c
rename to tests/expectations/const_generics_constant_tag.c
diff --git a/tests/expectations/const_generics_constant.tag.compat.c b/tests/expectations/const_generics_constant_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_constant.tag.compat.c
rename to tests/expectations/const_generics_constant_tag.compat.c
diff --git a/tests/expectations/const_generics_constant.tag.pyx b/tests/expectations/const_generics_constant_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_constant.tag.pyx
rename to tests/expectations/const_generics_constant_tag.pyx
diff --git a/tests/expectations/const_generics.tag.c b/tests/expectations/const_generics_tag.c
similarity index 100%
rename from tests/expectations/const_generics.tag.c
rename to tests/expectations/const_generics_tag.c
diff --git a/tests/expectations/const_generics.tag.compat.c b/tests/expectations/const_generics_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics.tag.compat.c
rename to tests/expectations/const_generics_tag.compat.c
diff --git a/tests/expectations/const_generics.tag.pyx b/tests/expectations/const_generics_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics.tag.pyx
rename to tests/expectations/const_generics_tag.pyx
diff --git a/tests/expectations/const_generics_thru.both.c b/tests/expectations/const_generics_thru_both.c
similarity index 100%
rename from tests/expectations/const_generics_thru.both.c
rename to tests/expectations/const_generics_thru_both.c
diff --git a/tests/expectations/const_generics_thru.both.compat.c b/tests/expectations/const_generics_thru_both.compat.c
similarity index 100%
rename from tests/expectations/const_generics_thru.both.compat.c
rename to tests/expectations/const_generics_thru_both.compat.c
diff --git a/tests/expectations/const_generics_thru.tag.c b/tests/expectations/const_generics_thru_tag.c
similarity index 100%
rename from tests/expectations/const_generics_thru.tag.c
rename to tests/expectations/const_generics_thru_tag.c
diff --git a/tests/expectations/const_generics_thru.tag.compat.c b/tests/expectations/const_generics_thru_tag.compat.c
similarity index 100%
rename from tests/expectations/const_generics_thru.tag.compat.c
rename to tests/expectations/const_generics_thru_tag.compat.c
diff --git a/tests/expectations/const_generics_thru.tag.pyx b/tests/expectations/const_generics_thru_tag.pyx
similarity index 100%
rename from tests/expectations/const_generics_thru.tag.pyx
rename to tests/expectations/const_generics_thru_tag.pyx
diff --git a/tests/expectations/constant.both.c b/tests/expectations/constant_both.c
similarity index 100%
rename from tests/expectations/constant.both.c
rename to tests/expectations/constant_both.c
diff --git a/tests/expectations/constant.both.compat.c b/tests/expectations/constant_both.compat.c
similarity index 100%
rename from tests/expectations/constant.both.compat.c
rename to tests/expectations/constant_both.compat.c
diff --git a/tests/expectations/constant_constexpr.both.compat.c b/tests/expectations/constant_constexpr_both.compat.c
similarity index 100%
rename from tests/expectations/constant_constexpr.both.compat.c
rename to tests/expectations/constant_constexpr_both.compat.c
diff --git a/tests/expectations/constant_constexpr.tag.compat.c b/tests/expectations/constant_constexpr_tag.compat.c
similarity index 100%
rename from tests/expectations/constant_constexpr.tag.compat.c
rename to tests/expectations/constant_constexpr_tag.compat.c
diff --git a/tests/expectations/constant_constexpr.tag.pyx b/tests/expectations/constant_constexpr_tag.pyx
similarity index 100%
rename from tests/expectations/constant_constexpr.tag.pyx
rename to tests/expectations/constant_constexpr_tag.pyx
diff --git a/tests/expectations/constant.tag.c b/tests/expectations/constant_tag.c
similarity index 100%
rename from tests/expectations/constant.tag.c
rename to tests/expectations/constant_tag.c
diff --git a/tests/expectations/constant.tag.compat.c b/tests/expectations/constant_tag.compat.c
similarity index 100%
rename from tests/expectations/constant.tag.compat.c
rename to tests/expectations/constant_tag.compat.c
diff --git a/tests/expectations/constant.tag.pyx b/tests/expectations/constant_tag.pyx
similarity index 100%
rename from tests/expectations/constant.tag.pyx
rename to tests/expectations/constant_tag.pyx
diff --git a/tests/expectations/constant_user_defined_type.both.compat.c b/tests/expectations/constant_user_defined_type_both.compat.c
similarity index 100%
rename from tests/expectations/constant_user_defined_type.both.compat.c
rename to tests/expectations/constant_user_defined_type_both.compat.c
diff --git a/tests/expectations/constant_user_defined_type.tag.compat.c b/tests/expectations/constant_user_defined_type_tag.compat.c
similarity index 100%
rename from tests/expectations/constant_user_defined_type.tag.compat.c
rename to tests/expectations/constant_user_defined_type_tag.compat.c
diff --git a/tests/expectations/constant_user_defined_type.tag.pyx b/tests/expectations/constant_user_defined_type_tag.pyx
similarity index 100%
rename from tests/expectations/constant_user_defined_type.tag.pyx
rename to tests/expectations/constant_user_defined_type_tag.pyx
diff --git a/tests/expectations/decl_name_conflicting.both.c b/tests/expectations/decl_name_conflicting_both.c
similarity index 100%
rename from tests/expectations/decl_name_conflicting.both.c
rename to tests/expectations/decl_name_conflicting_both.c
diff --git a/tests/expectations/decl_name_conflicting.both.compat.c b/tests/expectations/decl_name_conflicting_both.compat.c
similarity index 100%
rename from tests/expectations/decl_name_conflicting.both.compat.c
rename to tests/expectations/decl_name_conflicting_both.compat.c
diff --git a/tests/expectations/decl_name_conflicting.tag.c b/tests/expectations/decl_name_conflicting_tag.c
similarity index 100%
rename from tests/expectations/decl_name_conflicting.tag.c
rename to tests/expectations/decl_name_conflicting_tag.c
diff --git a/tests/expectations/decl_name_conflicting.tag.compat.c b/tests/expectations/decl_name_conflicting_tag.compat.c
similarity index 100%
rename from tests/expectations/decl_name_conflicting.tag.compat.c
rename to tests/expectations/decl_name_conflicting_tag.compat.c
diff --git a/tests/expectations/decl_name_conflicting.tag.pyx b/tests/expectations/decl_name_conflicting_tag.pyx
similarity index 100%
rename from tests/expectations/decl_name_conflicting.tag.pyx
rename to tests/expectations/decl_name_conflicting_tag.pyx
diff --git a/tests/expectations/dep_v2.both.c b/tests/expectations/dep_v2_both.c
similarity index 100%
rename from tests/expectations/dep_v2.both.c
rename to tests/expectations/dep_v2_both.c
diff --git a/tests/expectations/dep_v2.both.compat.c b/tests/expectations/dep_v2_both.compat.c
similarity index 100%
rename from tests/expectations/dep_v2.both.compat.c
rename to tests/expectations/dep_v2_both.compat.c
diff --git a/tests/expectations/dep_v2.tag.c b/tests/expectations/dep_v2_tag.c
similarity index 100%
rename from tests/expectations/dep_v2.tag.c
rename to tests/expectations/dep_v2_tag.c
diff --git a/tests/expectations/dep_v2.tag.compat.c b/tests/expectations/dep_v2_tag.compat.c
similarity index 100%
rename from tests/expectations/dep_v2.tag.compat.c
rename to tests/expectations/dep_v2_tag.compat.c
diff --git a/tests/expectations/dep_v2.tag.pyx b/tests/expectations/dep_v2_tag.pyx
similarity index 100%
rename from tests/expectations/dep_v2.tag.pyx
rename to tests/expectations/dep_v2_tag.pyx
diff --git a/tests/expectations/derive_eq.both.c b/tests/expectations/derive_eq_both.c
similarity index 100%
rename from tests/expectations/derive_eq.both.c
rename to tests/expectations/derive_eq_both.c
diff --git a/tests/expectations/derive_eq.both.compat.c b/tests/expectations/derive_eq_both.compat.c
similarity index 100%
rename from tests/expectations/derive_eq.both.compat.c
rename to tests/expectations/derive_eq_both.compat.c
diff --git a/tests/expectations/derive_eq.tag.c b/tests/expectations/derive_eq_tag.c
similarity index 100%
rename from tests/expectations/derive_eq.tag.c
rename to tests/expectations/derive_eq_tag.c
diff --git a/tests/expectations/derive_eq.tag.compat.c b/tests/expectations/derive_eq_tag.compat.c
similarity index 100%
rename from tests/expectations/derive_eq.tag.compat.c
rename to tests/expectations/derive_eq_tag.compat.c
diff --git a/tests/expectations/derive_eq.tag.pyx b/tests/expectations/derive_eq_tag.pyx
similarity index 100%
rename from tests/expectations/derive_eq.tag.pyx
rename to tests/expectations/derive_eq_tag.pyx
diff --git a/tests/expectations/derive_ostream.both.c b/tests/expectations/derive_ostream_both.c
similarity index 100%
rename from tests/expectations/derive_ostream.both.c
rename to tests/expectations/derive_ostream_both.c
diff --git a/tests/expectations/derive_ostream.both.compat.c b/tests/expectations/derive_ostream_both.compat.c
similarity index 100%
rename from tests/expectations/derive_ostream.both.compat.c
rename to tests/expectations/derive_ostream_both.compat.c
diff --git a/tests/expectations/derive_ostream.tag.c b/tests/expectations/derive_ostream_tag.c
similarity index 100%
rename from tests/expectations/derive_ostream.tag.c
rename to tests/expectations/derive_ostream_tag.c
diff --git a/tests/expectations/derive_ostream.tag.compat.c b/tests/expectations/derive_ostream_tag.compat.c
similarity index 100%
rename from tests/expectations/derive_ostream.tag.compat.c
rename to tests/expectations/derive_ostream_tag.compat.c
diff --git a/tests/expectations/derive_ostream.tag.pyx b/tests/expectations/derive_ostream_tag.pyx
similarity index 100%
rename from tests/expectations/derive_ostream.tag.pyx
rename to tests/expectations/derive_ostream_tag.pyx
diff --git a/tests/expectations/destructor_and_copy_ctor.both.c b/tests/expectations/destructor_and_copy_ctor_both.c
similarity index 100%
rename from tests/expectations/destructor_and_copy_ctor.both.c
rename to tests/expectations/destructor_and_copy_ctor_both.c
diff --git a/tests/expectations/destructor_and_copy_ctor.both.compat.c b/tests/expectations/destructor_and_copy_ctor_both.compat.c
similarity index 100%
rename from tests/expectations/destructor_and_copy_ctor.both.compat.c
rename to tests/expectations/destructor_and_copy_ctor_both.compat.c
diff --git a/tests/expectations/destructor_and_copy_ctor.tag.c b/tests/expectations/destructor_and_copy_ctor_tag.c
similarity index 100%
rename from tests/expectations/destructor_and_copy_ctor.tag.c
rename to tests/expectations/destructor_and_copy_ctor_tag.c
diff --git a/tests/expectations/destructor_and_copy_ctor.tag.compat.c b/tests/expectations/destructor_and_copy_ctor_tag.compat.c
similarity index 100%
rename from tests/expectations/destructor_and_copy_ctor.tag.compat.c
rename to tests/expectations/destructor_and_copy_ctor_tag.compat.c
diff --git a/tests/expectations/destructor_and_copy_ctor.tag.pyx b/tests/expectations/destructor_and_copy_ctor_tag.pyx
similarity index 100%
rename from tests/expectations/destructor_and_copy_ctor.tag.pyx
rename to tests/expectations/destructor_and_copy_ctor_tag.pyx
diff --git a/tests/expectations/display_list.both.c b/tests/expectations/display_list_both.c
similarity index 100%
rename from tests/expectations/display_list.both.c
rename to tests/expectations/display_list_both.c
diff --git a/tests/expectations/display_list.both.compat.c b/tests/expectations/display_list_both.compat.c
similarity index 100%
rename from tests/expectations/display_list.both.compat.c
rename to tests/expectations/display_list_both.compat.c
diff --git a/tests/expectations/display_list.tag.c b/tests/expectations/display_list_tag.c
similarity index 100%
rename from tests/expectations/display_list.tag.c
rename to tests/expectations/display_list_tag.c
diff --git a/tests/expectations/display_list.tag.compat.c b/tests/expectations/display_list_tag.compat.c
similarity index 100%
rename from tests/expectations/display_list.tag.compat.c
rename to tests/expectations/display_list_tag.compat.c
diff --git a/tests/expectations/display_list.tag.pyx b/tests/expectations/display_list_tag.pyx
similarity index 100%
rename from tests/expectations/display_list.tag.pyx
rename to tests/expectations/display_list_tag.pyx
diff --git a/tests/expectations/enum.both.c b/tests/expectations/enum_both.c
similarity index 100%
rename from tests/expectations/enum.both.c
rename to tests/expectations/enum_both.c
diff --git a/tests/expectations/enum.both.compat.c b/tests/expectations/enum_both.compat.c
similarity index 100%
rename from tests/expectations/enum.both.compat.c
rename to tests/expectations/enum_both.compat.c
diff --git a/tests/expectations/enum_self.both.c b/tests/expectations/enum_self_both.c
similarity index 100%
rename from tests/expectations/enum_self.both.c
rename to tests/expectations/enum_self_both.c
diff --git a/tests/expectations/enum_self.both.compat.c b/tests/expectations/enum_self_both.compat.c
similarity index 100%
rename from tests/expectations/enum_self.both.compat.c
rename to tests/expectations/enum_self_both.compat.c
diff --git a/tests/expectations/enum_self.tag.c b/tests/expectations/enum_self_tag.c
similarity index 100%
rename from tests/expectations/enum_self.tag.c
rename to tests/expectations/enum_self_tag.c
diff --git a/tests/expectations/enum_self.tag.compat.c b/tests/expectations/enum_self_tag.compat.c
similarity index 100%
rename from tests/expectations/enum_self.tag.compat.c
rename to tests/expectations/enum_self_tag.compat.c
diff --git a/tests/expectations/enum_self.tag.pyx b/tests/expectations/enum_self_tag.pyx
similarity index 100%
rename from tests/expectations/enum_self.tag.pyx
rename to tests/expectations/enum_self_tag.pyx
diff --git a/tests/expectations/enum.tag.c b/tests/expectations/enum_tag.c
similarity index 100%
rename from tests/expectations/enum.tag.c
rename to tests/expectations/enum_tag.c
diff --git a/tests/expectations/enum.tag.compat.c b/tests/expectations/enum_tag.compat.c
similarity index 100%
rename from tests/expectations/enum.tag.compat.c
rename to tests/expectations/enum_tag.compat.c
diff --git a/tests/expectations/enum.tag.pyx b/tests/expectations/enum_tag.pyx
similarity index 100%
rename from tests/expectations/enum.tag.pyx
rename to tests/expectations/enum_tag.pyx
diff --git a/tests/expectations/euclid.both.c b/tests/expectations/euclid_both.c
similarity index 100%
rename from tests/expectations/euclid.both.c
rename to tests/expectations/euclid_both.c
diff --git a/tests/expectations/euclid.both.compat.c b/tests/expectations/euclid_both.compat.c
similarity index 100%
rename from tests/expectations/euclid.both.compat.c
rename to tests/expectations/euclid_both.compat.c
diff --git a/tests/expectations/euclid.tag.c b/tests/expectations/euclid_tag.c
similarity index 100%
rename from tests/expectations/euclid.tag.c
rename to tests/expectations/euclid_tag.c
diff --git a/tests/expectations/euclid.tag.compat.c b/tests/expectations/euclid_tag.compat.c
similarity index 100%
rename from tests/expectations/euclid.tag.compat.c
rename to tests/expectations/euclid_tag.compat.c
diff --git a/tests/expectations/euclid.tag.pyx b/tests/expectations/euclid_tag.pyx
similarity index 100%
rename from tests/expectations/euclid.tag.pyx
rename to tests/expectations/euclid_tag.pyx
diff --git a/tests/expectations/exclude_generic_monomorph.both.c b/tests/expectations/exclude_generic_monomorph_both.c
similarity index 100%
rename from tests/expectations/exclude_generic_monomorph.both.c
rename to tests/expectations/exclude_generic_monomorph_both.c
diff --git a/tests/expectations/exclude_generic_monomorph.both.compat.c b/tests/expectations/exclude_generic_monomorph_both.compat.c
similarity index 100%
rename from tests/expectations/exclude_generic_monomorph.both.compat.c
rename to tests/expectations/exclude_generic_monomorph_both.compat.c
diff --git a/tests/expectations/exclude_generic_monomorph.tag.c b/tests/expectations/exclude_generic_monomorph_tag.c
similarity index 100%
rename from tests/expectations/exclude_generic_monomorph.tag.c
rename to tests/expectations/exclude_generic_monomorph_tag.c
diff --git a/tests/expectations/exclude_generic_monomorph.tag.compat.c b/tests/expectations/exclude_generic_monomorph_tag.compat.c
similarity index 100%
rename from tests/expectations/exclude_generic_monomorph.tag.compat.c
rename to tests/expectations/exclude_generic_monomorph_tag.compat.c
diff --git a/tests/expectations/exclude_generic_monomorph.tag.pyx b/tests/expectations/exclude_generic_monomorph_tag.pyx
similarity index 100%
rename from tests/expectations/exclude_generic_monomorph.tag.pyx
rename to tests/expectations/exclude_generic_monomorph_tag.pyx
diff --git a/tests/expectations/expand.both.c b/tests/expectations/expand_both.c
similarity index 100%
rename from tests/expectations/expand.both.c
rename to tests/expectations/expand_both.c
diff --git a/tests/expectations/expand.both.compat.c b/tests/expectations/expand_both.compat.c
similarity index 100%
rename from tests/expectations/expand.both.compat.c
rename to tests/expectations/expand_both.compat.c
diff --git a/tests/expectations/expand_default_features.both.c b/tests/expectations/expand_default_features_both.c
similarity index 100%
rename from tests/expectations/expand_default_features.both.c
rename to tests/expectations/expand_default_features_both.c
diff --git a/tests/expectations/expand_default_features.both.compat.c b/tests/expectations/expand_default_features_both.compat.c
similarity index 100%
rename from tests/expectations/expand_default_features.both.compat.c
rename to tests/expectations/expand_default_features_both.compat.c
diff --git a/tests/expectations/expand_default_features.tag.c b/tests/expectations/expand_default_features_tag.c
similarity index 100%
rename from tests/expectations/expand_default_features.tag.c
rename to tests/expectations/expand_default_features_tag.c
diff --git a/tests/expectations/expand_default_features.tag.compat.c b/tests/expectations/expand_default_features_tag.compat.c
similarity index 100%
rename from tests/expectations/expand_default_features.tag.compat.c
rename to tests/expectations/expand_default_features_tag.compat.c
diff --git a/tests/expectations/expand_default_features.tag.pyx b/tests/expectations/expand_default_features_tag.pyx
similarity index 100%
rename from tests/expectations/expand_default_features.tag.pyx
rename to tests/expectations/expand_default_features_tag.pyx
diff --git a/tests/expectations/expand_dep.both.c b/tests/expectations/expand_dep_both.c
similarity index 100%
rename from tests/expectations/expand_dep.both.c
rename to tests/expectations/expand_dep_both.c
diff --git a/tests/expectations/expand_dep.both.compat.c b/tests/expectations/expand_dep_both.compat.c
similarity index 100%
rename from tests/expectations/expand_dep.both.compat.c
rename to tests/expectations/expand_dep_both.compat.c
diff --git a/tests/expectations/expand_dep.tag.c b/tests/expectations/expand_dep_tag.c
similarity index 100%
rename from tests/expectations/expand_dep.tag.c
rename to tests/expectations/expand_dep_tag.c
diff --git a/tests/expectations/expand_dep.tag.compat.c b/tests/expectations/expand_dep_tag.compat.c
similarity index 100%
rename from tests/expectations/expand_dep.tag.compat.c
rename to tests/expectations/expand_dep_tag.compat.c
diff --git a/tests/expectations/expand_dep.tag.pyx b/tests/expectations/expand_dep_tag.pyx
similarity index 100%
rename from tests/expectations/expand_dep.tag.pyx
rename to tests/expectations/expand_dep_tag.pyx
diff --git a/tests/expectations/expand_dep_v2.both.c b/tests/expectations/expand_dep_v2_both.c
similarity index 100%
rename from tests/expectations/expand_dep_v2.both.c
rename to tests/expectations/expand_dep_v2_both.c
diff --git a/tests/expectations/expand_dep_v2.both.compat.c b/tests/expectations/expand_dep_v2_both.compat.c
similarity index 100%
rename from tests/expectations/expand_dep_v2.both.compat.c
rename to tests/expectations/expand_dep_v2_both.compat.c
diff --git a/tests/expectations/expand_dep_v2.tag.c b/tests/expectations/expand_dep_v2_tag.c
similarity index 100%
rename from tests/expectations/expand_dep_v2.tag.c
rename to tests/expectations/expand_dep_v2_tag.c
diff --git a/tests/expectations/expand_dep_v2.tag.compat.c b/tests/expectations/expand_dep_v2_tag.compat.c
similarity index 100%
rename from tests/expectations/expand_dep_v2.tag.compat.c
rename to tests/expectations/expand_dep_v2_tag.compat.c
diff --git a/tests/expectations/expand_dep_v2.tag.pyx b/tests/expectations/expand_dep_v2_tag.pyx
similarity index 100%
rename from tests/expectations/expand_dep_v2.tag.pyx
rename to tests/expectations/expand_dep_v2_tag.pyx
diff --git a/tests/expectations/expand_features.both.c b/tests/expectations/expand_features_both.c
similarity index 100%
rename from tests/expectations/expand_features.both.c
rename to tests/expectations/expand_features_both.c
diff --git a/tests/expectations/expand_features.both.compat.c b/tests/expectations/expand_features_both.compat.c
similarity index 100%
rename from tests/expectations/expand_features.both.compat.c
rename to tests/expectations/expand_features_both.compat.c
diff --git a/tests/expectations/expand_features.tag.c b/tests/expectations/expand_features_tag.c
similarity index 100%
rename from tests/expectations/expand_features.tag.c
rename to tests/expectations/expand_features_tag.c
diff --git a/tests/expectations/expand_features.tag.compat.c b/tests/expectations/expand_features_tag.compat.c
similarity index 100%
rename from tests/expectations/expand_features.tag.compat.c
rename to tests/expectations/expand_features_tag.compat.c
diff --git a/tests/expectations/expand_features.tag.pyx b/tests/expectations/expand_features_tag.pyx
similarity index 100%
rename from tests/expectations/expand_features.tag.pyx
rename to tests/expectations/expand_features_tag.pyx
diff --git a/tests/expectations/expand_no_default_features.both.c b/tests/expectations/expand_no_default_features_both.c
similarity index 100%
rename from tests/expectations/expand_no_default_features.both.c
rename to tests/expectations/expand_no_default_features_both.c
diff --git a/tests/expectations/expand_no_default_features.both.compat.c b/tests/expectations/expand_no_default_features_both.compat.c
similarity index 100%
rename from tests/expectations/expand_no_default_features.both.compat.c
rename to tests/expectations/expand_no_default_features_both.compat.c
diff --git a/tests/expectations/expand.tag.c b/tests/expectations/expand_no_default_features_tag.c
similarity index 100%
rename from tests/expectations/expand.tag.c
rename to tests/expectations/expand_no_default_features_tag.c
diff --git a/tests/expectations/expand.tag.compat.c b/tests/expectations/expand_no_default_features_tag.compat.c
similarity index 100%
rename from tests/expectations/expand.tag.compat.c
rename to tests/expectations/expand_no_default_features_tag.compat.c
diff --git a/tests/expectations/expand.tag.pyx b/tests/expectations/expand_no_default_features_tag.pyx
similarity index 100%
rename from tests/expectations/expand.tag.pyx
rename to tests/expectations/expand_no_default_features_tag.pyx
diff --git a/tests/expectations/expand_no_default_features.tag.c b/tests/expectations/expand_tag.c
similarity index 100%
rename from tests/expectations/expand_no_default_features.tag.c
rename to tests/expectations/expand_tag.c
diff --git a/tests/expectations/expand_no_default_features.tag.compat.c b/tests/expectations/expand_tag.compat.c
similarity index 100%
rename from tests/expectations/expand_no_default_features.tag.compat.c
rename to tests/expectations/expand_tag.compat.c
diff --git a/tests/expectations/expand_no_default_features.tag.pyx b/tests/expectations/expand_tag.pyx
similarity index 100%
rename from tests/expectations/expand_no_default_features.tag.pyx
rename to tests/expectations/expand_tag.pyx
diff --git a/tests/expectations/extern.both.c b/tests/expectations/extern_both.c
similarity index 100%
rename from tests/expectations/extern.both.c
rename to tests/expectations/extern_both.c
diff --git a/tests/expectations/extern.both.compat.c b/tests/expectations/extern_both.compat.c
similarity index 100%
rename from tests/expectations/extern.both.compat.c
rename to tests/expectations/extern_both.compat.c
diff --git a/tests/expectations/extern.tag.c b/tests/expectations/extern_tag.c
similarity index 100%
rename from tests/expectations/extern.tag.c
rename to tests/expectations/extern_tag.c
diff --git a/tests/expectations/extern.tag.compat.c b/tests/expectations/extern_tag.compat.c
similarity index 100%
rename from tests/expectations/extern.tag.compat.c
rename to tests/expectations/extern_tag.compat.c
diff --git a/tests/expectations/extern.tag.pyx b/tests/expectations/extern_tag.pyx
similarity index 100%
rename from tests/expectations/extern.tag.pyx
rename to tests/expectations/extern_tag.pyx
diff --git a/tests/expectations/external_workspace_child.both.c b/tests/expectations/external_workspace_child_both.c
similarity index 100%
rename from tests/expectations/external_workspace_child.both.c
rename to tests/expectations/external_workspace_child_both.c
diff --git a/tests/expectations/external_workspace_child.both.compat.c b/tests/expectations/external_workspace_child_both.compat.c
similarity index 100%
rename from tests/expectations/external_workspace_child.both.compat.c
rename to tests/expectations/external_workspace_child_both.compat.c
diff --git a/tests/expectations/external_workspace_child.tag.c b/tests/expectations/external_workspace_child_tag.c
similarity index 100%
rename from tests/expectations/external_workspace_child.tag.c
rename to tests/expectations/external_workspace_child_tag.c
diff --git a/tests/expectations/external_workspace_child.tag.compat.c b/tests/expectations/external_workspace_child_tag.compat.c
similarity index 100%
rename from tests/expectations/external_workspace_child.tag.compat.c
rename to tests/expectations/external_workspace_child_tag.compat.c
diff --git a/tests/expectations/external_workspace_child.tag.pyx b/tests/expectations/external_workspace_child_tag.pyx
similarity index 100%
rename from tests/expectations/external_workspace_child.tag.pyx
rename to tests/expectations/external_workspace_child_tag.pyx
diff --git a/tests/expectations/fns.both.c b/tests/expectations/fns_both.c
similarity index 100%
rename from tests/expectations/fns.both.c
rename to tests/expectations/fns_both.c
diff --git a/tests/expectations/fns.both.compat.c b/tests/expectations/fns_both.compat.c
similarity index 100%
rename from tests/expectations/fns.both.compat.c
rename to tests/expectations/fns_both.compat.c
diff --git a/tests/expectations/fns.tag.c b/tests/expectations/fns_tag.c
similarity index 100%
rename from tests/expectations/fns.tag.c
rename to tests/expectations/fns_tag.c
diff --git a/tests/expectations/fns.tag.compat.c b/tests/expectations/fns_tag.compat.c
similarity index 100%
rename from tests/expectations/fns.tag.compat.c
rename to tests/expectations/fns_tag.compat.c
diff --git a/tests/expectations/fns.tag.pyx b/tests/expectations/fns_tag.pyx
similarity index 100%
rename from tests/expectations/fns.tag.pyx
rename to tests/expectations/fns_tag.pyx
diff --git a/tests/expectations/forward_declaration.both.c b/tests/expectations/forward_declaration_both.c
similarity index 100%
rename from tests/expectations/forward_declaration.both.c
rename to tests/expectations/forward_declaration_both.c
diff --git a/tests/expectations/forward_declaration.both.compat.c b/tests/expectations/forward_declaration_both.compat.c
similarity index 100%
rename from tests/expectations/forward_declaration.both.compat.c
rename to tests/expectations/forward_declaration_both.compat.c
diff --git a/tests/expectations/forward_declaration.tag.c b/tests/expectations/forward_declaration_tag.c
similarity index 100%
rename from tests/expectations/forward_declaration.tag.c
rename to tests/expectations/forward_declaration_tag.c
diff --git a/tests/expectations/forward_declaration.tag.compat.c b/tests/expectations/forward_declaration_tag.compat.c
similarity index 100%
rename from tests/expectations/forward_declaration.tag.compat.c
rename to tests/expectations/forward_declaration_tag.compat.c
diff --git a/tests/expectations/forward_declaration.tag.pyx b/tests/expectations/forward_declaration_tag.pyx
similarity index 100%
rename from tests/expectations/forward_declaration.tag.pyx
rename to tests/expectations/forward_declaration_tag.pyx
diff --git a/tests/expectations/function_noreturn.both.c b/tests/expectations/function_noreturn_both.c
similarity index 100%
rename from tests/expectations/function_noreturn.both.c
rename to tests/expectations/function_noreturn_both.c
diff --git a/tests/expectations/function_noreturn.both.compat.c b/tests/expectations/function_noreturn_both.compat.c
similarity index 100%
rename from tests/expectations/function_noreturn.both.compat.c
rename to tests/expectations/function_noreturn_both.compat.c
diff --git a/tests/expectations/function_noreturn.tag.c b/tests/expectations/function_noreturn_tag.c
similarity index 100%
rename from tests/expectations/function_noreturn.tag.c
rename to tests/expectations/function_noreturn_tag.c
diff --git a/tests/expectations/function_noreturn.tag.compat.c b/tests/expectations/function_noreturn_tag.compat.c
similarity index 100%
rename from tests/expectations/function_noreturn.tag.compat.c
rename to tests/expectations/function_noreturn_tag.compat.c
diff --git a/tests/expectations/function_noreturn.tag.pyx b/tests/expectations/function_noreturn_tag.pyx
similarity index 100%
rename from tests/expectations/function_noreturn.tag.pyx
rename to tests/expectations/function_noreturn_tag.pyx
diff --git a/tests/expectations/generic_pointer.both.c b/tests/expectations/generic_pointer_both.c
similarity index 100%
rename from tests/expectations/generic_pointer.both.c
rename to tests/expectations/generic_pointer_both.c
diff --git a/tests/expectations/generic_pointer.both.compat.c b/tests/expectations/generic_pointer_both.compat.c
similarity index 100%
rename from tests/expectations/generic_pointer.both.compat.c
rename to tests/expectations/generic_pointer_both.compat.c
diff --git a/tests/expectations/generic_pointer.tag.c b/tests/expectations/generic_pointer_tag.c
similarity index 100%
rename from tests/expectations/generic_pointer.tag.c
rename to tests/expectations/generic_pointer_tag.c
diff --git a/tests/expectations/generic_pointer.tag.compat.c b/tests/expectations/generic_pointer_tag.compat.c
similarity index 100%
rename from tests/expectations/generic_pointer.tag.compat.c
rename to tests/expectations/generic_pointer_tag.compat.c
diff --git a/tests/expectations/generic_pointer.tag.pyx b/tests/expectations/generic_pointer_tag.pyx
similarity index 100%
rename from tests/expectations/generic_pointer.tag.pyx
rename to tests/expectations/generic_pointer_tag.pyx
diff --git a/tests/expectations/include_item.both.compat.c b/tests/expectations/include_item_both.compat.c
similarity index 100%
rename from tests/expectations/include_item.both.compat.c
rename to tests/expectations/include_item_both.compat.c
diff --git a/tests/expectations/include_item.tag.compat.c b/tests/expectations/include_item_tag.compat.c
similarity index 100%
rename from tests/expectations/include_item.tag.compat.c
rename to tests/expectations/include_item_tag.compat.c
diff --git a/tests/expectations/include_item.tag.pyx b/tests/expectations/include_item_tag.pyx
similarity index 100%
rename from tests/expectations/include_item.tag.pyx
rename to tests/expectations/include_item_tag.pyx
diff --git a/tests/expectations/inner_mod.both.c b/tests/expectations/inner_mod_both.c
similarity index 100%
rename from tests/expectations/inner_mod.both.c
rename to tests/expectations/inner_mod_both.c
diff --git a/tests/expectations/inner_mod.both.compat.c b/tests/expectations/inner_mod_both.compat.c
similarity index 100%
rename from tests/expectations/inner_mod.both.compat.c
rename to tests/expectations/inner_mod_both.compat.c
diff --git a/tests/expectations/inner_mod.tag.c b/tests/expectations/inner_mod_tag.c
similarity index 100%
rename from tests/expectations/inner_mod.tag.c
rename to tests/expectations/inner_mod_tag.c
diff --git a/tests/expectations/inner_mod.tag.compat.c b/tests/expectations/inner_mod_tag.compat.c
similarity index 100%
rename from tests/expectations/inner_mod.tag.compat.c
rename to tests/expectations/inner_mod_tag.compat.c
diff --git a/tests/expectations/inner_mod.tag.pyx b/tests/expectations/inner_mod_tag.pyx
similarity index 100%
rename from tests/expectations/inner_mod.tag.pyx
rename to tests/expectations/inner_mod_tag.pyx
diff --git a/tests/expectations/layout_aligned_opaque.both.compat.c b/tests/expectations/layout_aligned_opaque_both.compat.c
similarity index 100%
rename from tests/expectations/layout_aligned_opaque.both.compat.c
rename to tests/expectations/layout_aligned_opaque_both.compat.c
diff --git a/tests/expectations/layout_aligned_opaque.tag.compat.c b/tests/expectations/layout_aligned_opaque_tag.compat.c
similarity index 100%
rename from tests/expectations/layout_aligned_opaque.tag.compat.c
rename to tests/expectations/layout_aligned_opaque_tag.compat.c
diff --git a/tests/expectations/layout_aligned_opaque.tag.pyx b/tests/expectations/layout_aligned_opaque_tag.pyx
similarity index 100%
rename from tests/expectations/layout_aligned_opaque.tag.pyx
rename to tests/expectations/layout_aligned_opaque_tag.pyx
diff --git a/tests/expectations/layout.both.compat.c b/tests/expectations/layout_both.compat.c
similarity index 100%
rename from tests/expectations/layout.both.compat.c
rename to tests/expectations/layout_both.compat.c
diff --git a/tests/expectations/layout_packed_opaque.both.compat.c b/tests/expectations/layout_packed_opaque_both.compat.c
similarity index 100%
rename from tests/expectations/layout_packed_opaque.both.compat.c
rename to tests/expectations/layout_packed_opaque_both.compat.c
diff --git a/tests/expectations/layout_packed_opaque.tag.compat.c b/tests/expectations/layout_packed_opaque_tag.compat.c
similarity index 100%
rename from tests/expectations/layout_packed_opaque.tag.compat.c
rename to tests/expectations/layout_packed_opaque_tag.compat.c
diff --git a/tests/expectations/layout_packed_opaque.tag.pyx b/tests/expectations/layout_packed_opaque_tag.pyx
similarity index 100%
rename from tests/expectations/layout_packed_opaque.tag.pyx
rename to tests/expectations/layout_packed_opaque_tag.pyx
diff --git a/tests/expectations/layout.tag.compat.c b/tests/expectations/layout_tag.compat.c
similarity index 100%
rename from tests/expectations/layout.tag.compat.c
rename to tests/expectations/layout_tag.compat.c
diff --git a/tests/expectations/layout.tag.pyx b/tests/expectations/layout_tag.pyx
similarity index 100%
rename from tests/expectations/layout.tag.pyx
rename to tests/expectations/layout_tag.pyx
diff --git a/tests/expectations/lifetime_arg.both.c b/tests/expectations/lifetime_arg_both.c
similarity index 100%
rename from tests/expectations/lifetime_arg.both.c
rename to tests/expectations/lifetime_arg_both.c
diff --git a/tests/expectations/lifetime_arg.both.compat.c b/tests/expectations/lifetime_arg_both.compat.c
similarity index 100%
rename from tests/expectations/lifetime_arg.both.compat.c
rename to tests/expectations/lifetime_arg_both.compat.c
diff --git a/tests/expectations/lifetime_arg.tag.c b/tests/expectations/lifetime_arg_tag.c
similarity index 100%
rename from tests/expectations/lifetime_arg.tag.c
rename to tests/expectations/lifetime_arg_tag.c
diff --git a/tests/expectations/lifetime_arg.tag.compat.c b/tests/expectations/lifetime_arg_tag.compat.c
similarity index 100%
rename from tests/expectations/lifetime_arg.tag.compat.c
rename to tests/expectations/lifetime_arg_tag.compat.c
diff --git a/tests/expectations/lifetime_arg.tag.pyx b/tests/expectations/lifetime_arg_tag.pyx
similarity index 100%
rename from tests/expectations/lifetime_arg.tag.pyx
rename to tests/expectations/lifetime_arg_tag.pyx
diff --git a/tests/expectations/linestyle_cr.both.c b/tests/expectations/linestyle_cr_both.c
similarity index 100%
rename from tests/expectations/linestyle_cr.both.c
rename to tests/expectations/linestyle_cr_both.c
diff --git a/tests/expectations/linestyle_cr.both.compat.c b/tests/expectations/linestyle_cr_both.compat.c
similarity index 100%
rename from tests/expectations/linestyle_cr.both.compat.c
rename to tests/expectations/linestyle_cr_both.compat.c
diff --git a/tests/expectations/linestyle_cr.tag.c b/tests/expectations/linestyle_cr_tag.c
similarity index 100%
rename from tests/expectations/linestyle_cr.tag.c
rename to tests/expectations/linestyle_cr_tag.c
diff --git a/tests/expectations/linestyle_cr.tag.compat.c b/tests/expectations/linestyle_cr_tag.compat.c
similarity index 100%
rename from tests/expectations/linestyle_cr.tag.compat.c
rename to tests/expectations/linestyle_cr_tag.compat.c
diff --git a/tests/expectations/linestyle_cr.tag.pyx b/tests/expectations/linestyle_cr_tag.pyx
similarity index 100%
rename from tests/expectations/linestyle_cr.tag.pyx
rename to tests/expectations/linestyle_cr_tag.pyx
diff --git a/tests/expectations/linestyle_crlf.both.c b/tests/expectations/linestyle_crlf_both.c
similarity index 100%
rename from tests/expectations/linestyle_crlf.both.c
rename to tests/expectations/linestyle_crlf_both.c
diff --git a/tests/expectations/linestyle_crlf.both.compat.c b/tests/expectations/linestyle_crlf_both.compat.c
similarity index 100%
rename from tests/expectations/linestyle_crlf.both.compat.c
rename to tests/expectations/linestyle_crlf_both.compat.c
diff --git a/tests/expectations/linestyle_crlf.tag.c b/tests/expectations/linestyle_crlf_tag.c
similarity index 100%
rename from tests/expectations/linestyle_crlf.tag.c
rename to tests/expectations/linestyle_crlf_tag.c
diff --git a/tests/expectations/linestyle_crlf.tag.compat.c b/tests/expectations/linestyle_crlf_tag.compat.c
similarity index 100%
rename from tests/expectations/linestyle_crlf.tag.compat.c
rename to tests/expectations/linestyle_crlf_tag.compat.c
diff --git a/tests/expectations/linestyle_crlf.tag.pyx b/tests/expectations/linestyle_crlf_tag.pyx
similarity index 100%
rename from tests/expectations/linestyle_crlf.tag.pyx
rename to tests/expectations/linestyle_crlf_tag.pyx
diff --git a/tests/expectations/linestyle_lf.both.c b/tests/expectations/linestyle_lf_both.c
similarity index 100%
rename from tests/expectations/linestyle_lf.both.c
rename to tests/expectations/linestyle_lf_both.c
diff --git a/tests/expectations/linestyle_lf.both.compat.c b/tests/expectations/linestyle_lf_both.compat.c
similarity index 100%
rename from tests/expectations/linestyle_lf.both.compat.c
rename to tests/expectations/linestyle_lf_both.compat.c
diff --git a/tests/expectations/linestyle_lf.tag.c b/tests/expectations/linestyle_lf_tag.c
similarity index 100%
rename from tests/expectations/linestyle_lf.tag.c
rename to tests/expectations/linestyle_lf_tag.c
diff --git a/tests/expectations/linestyle_lf.tag.compat.c b/tests/expectations/linestyle_lf_tag.compat.c
similarity index 100%
rename from tests/expectations/linestyle_lf.tag.compat.c
rename to tests/expectations/linestyle_lf_tag.compat.c
diff --git a/tests/expectations/linestyle_lf.tag.pyx b/tests/expectations/linestyle_lf_tag.pyx
similarity index 100%
rename from tests/expectations/linestyle_lf.tag.pyx
rename to tests/expectations/linestyle_lf_tag.pyx
diff --git a/tests/expectations/mangle.both.c b/tests/expectations/mangle_both.c
similarity index 100%
rename from tests/expectations/mangle.both.c
rename to tests/expectations/mangle_both.c
diff --git a/tests/expectations/mangle.both.compat.c b/tests/expectations/mangle_both.compat.c
similarity index 100%
rename from tests/expectations/mangle.both.compat.c
rename to tests/expectations/mangle_both.compat.c
diff --git a/tests/expectations/mangle.tag.c b/tests/expectations/mangle_tag.c
similarity index 100%
rename from tests/expectations/mangle.tag.c
rename to tests/expectations/mangle_tag.c
diff --git a/tests/expectations/mangle.tag.compat.c b/tests/expectations/mangle_tag.compat.c
similarity index 100%
rename from tests/expectations/mangle.tag.compat.c
rename to tests/expectations/mangle_tag.compat.c
diff --git a/tests/expectations/mangle.tag.pyx b/tests/expectations/mangle_tag.pyx
similarity index 100%
rename from tests/expectations/mangle.tag.pyx
rename to tests/expectations/mangle_tag.pyx
diff --git a/tests/expectations/manuallydrop.both.c b/tests/expectations/manuallydrop_both.c
similarity index 100%
rename from tests/expectations/manuallydrop.both.c
rename to tests/expectations/manuallydrop_both.c
diff --git a/tests/expectations/manuallydrop.both.compat.c b/tests/expectations/manuallydrop_both.compat.c
similarity index 100%
rename from tests/expectations/manuallydrop.both.compat.c
rename to tests/expectations/manuallydrop_both.compat.c
diff --git a/tests/expectations/manuallydrop.tag.c b/tests/expectations/manuallydrop_tag.c
similarity index 100%
rename from tests/expectations/manuallydrop.tag.c
rename to tests/expectations/manuallydrop_tag.c
diff --git a/tests/expectations/manuallydrop.tag.compat.c b/tests/expectations/manuallydrop_tag.compat.c
similarity index 100%
rename from tests/expectations/manuallydrop.tag.compat.c
rename to tests/expectations/manuallydrop_tag.compat.c
diff --git a/tests/expectations/manuallydrop.tag.pyx b/tests/expectations/manuallydrop_tag.pyx
similarity index 100%
rename from tests/expectations/manuallydrop.tag.pyx
rename to tests/expectations/manuallydrop_tag.pyx
diff --git a/tests/expectations/maybeuninit.both.c b/tests/expectations/maybeuninit_both.c
similarity index 100%
rename from tests/expectations/maybeuninit.both.c
rename to tests/expectations/maybeuninit_both.c
diff --git a/tests/expectations/maybeuninit.both.compat.c b/tests/expectations/maybeuninit_both.compat.c
similarity index 100%
rename from tests/expectations/maybeuninit.both.compat.c
rename to tests/expectations/maybeuninit_both.compat.c
diff --git a/tests/expectations/maybeuninit.tag.c b/tests/expectations/maybeuninit_tag.c
similarity index 100%
rename from tests/expectations/maybeuninit.tag.c
rename to tests/expectations/maybeuninit_tag.c
diff --git a/tests/expectations/maybeuninit.tag.compat.c b/tests/expectations/maybeuninit_tag.compat.c
similarity index 100%
rename from tests/expectations/maybeuninit.tag.compat.c
rename to tests/expectations/maybeuninit_tag.compat.c
diff --git a/tests/expectations/maybeuninit.tag.pyx b/tests/expectations/maybeuninit_tag.pyx
similarity index 100%
rename from tests/expectations/maybeuninit.tag.pyx
rename to tests/expectations/maybeuninit_tag.pyx
diff --git a/tests/expectations/mod_2015.both.c b/tests/expectations/mod_2015_both.c
similarity index 100%
rename from tests/expectations/mod_2015.both.c
rename to tests/expectations/mod_2015_both.c
diff --git a/tests/expectations/mod_2015.both.compat.c b/tests/expectations/mod_2015_both.compat.c
similarity index 100%
rename from tests/expectations/mod_2015.both.compat.c
rename to tests/expectations/mod_2015_both.compat.c
diff --git a/tests/expectations/mod_2015.tag.c b/tests/expectations/mod_2015_tag.c
similarity index 100%
rename from tests/expectations/mod_2015.tag.c
rename to tests/expectations/mod_2015_tag.c
diff --git a/tests/expectations/mod_2015.tag.compat.c b/tests/expectations/mod_2015_tag.compat.c
similarity index 100%
rename from tests/expectations/mod_2015.tag.compat.c
rename to tests/expectations/mod_2015_tag.compat.c
diff --git a/tests/expectations/mod_2015.tag.pyx b/tests/expectations/mod_2015_tag.pyx
similarity index 100%
rename from tests/expectations/mod_2015.tag.pyx
rename to tests/expectations/mod_2015_tag.pyx
diff --git a/tests/expectations/mod_2018.both.c b/tests/expectations/mod_2018_both.c
similarity index 100%
rename from tests/expectations/mod_2018.both.c
rename to tests/expectations/mod_2018_both.c
diff --git a/tests/expectations/mod_2018.both.compat.c b/tests/expectations/mod_2018_both.compat.c
similarity index 100%
rename from tests/expectations/mod_2018.both.compat.c
rename to tests/expectations/mod_2018_both.compat.c
diff --git a/tests/expectations/mod_2018.tag.c b/tests/expectations/mod_2018_tag.c
similarity index 100%
rename from tests/expectations/mod_2018.tag.c
rename to tests/expectations/mod_2018_tag.c
diff --git a/tests/expectations/mod_2018.tag.compat.c b/tests/expectations/mod_2018_tag.compat.c
similarity index 100%
rename from tests/expectations/mod_2018.tag.compat.c
rename to tests/expectations/mod_2018_tag.compat.c
diff --git a/tests/expectations/mod_2018.tag.pyx b/tests/expectations/mod_2018_tag.pyx
similarity index 100%
rename from tests/expectations/mod_2018.tag.pyx
rename to tests/expectations/mod_2018_tag.pyx
diff --git a/tests/expectations/mod_attr.both.c b/tests/expectations/mod_attr_both.c
similarity index 100%
rename from tests/expectations/mod_attr.both.c
rename to tests/expectations/mod_attr_both.c
diff --git a/tests/expectations/mod_attr.both.compat.c b/tests/expectations/mod_attr_both.compat.c
similarity index 100%
rename from tests/expectations/mod_attr.both.compat.c
rename to tests/expectations/mod_attr_both.compat.c
diff --git a/tests/expectations/mod_attr.tag.c b/tests/expectations/mod_attr_tag.c
similarity index 100%
rename from tests/expectations/mod_attr.tag.c
rename to tests/expectations/mod_attr_tag.c
diff --git a/tests/expectations/mod_attr.tag.compat.c b/tests/expectations/mod_attr_tag.compat.c
similarity index 100%
rename from tests/expectations/mod_attr.tag.compat.c
rename to tests/expectations/mod_attr_tag.compat.c
diff --git a/tests/expectations/mod_attr.tag.pyx b/tests/expectations/mod_attr_tag.pyx
similarity index 100%
rename from tests/expectations/mod_attr.tag.pyx
rename to tests/expectations/mod_attr_tag.pyx
diff --git a/tests/expectations/mod_path.both.c b/tests/expectations/mod_path_both.c
similarity index 100%
rename from tests/expectations/mod_path.both.c
rename to tests/expectations/mod_path_both.c
diff --git a/tests/expectations/mod_path.both.compat.c b/tests/expectations/mod_path_both.compat.c
similarity index 100%
rename from tests/expectations/mod_path.both.compat.c
rename to tests/expectations/mod_path_both.compat.c
diff --git a/tests/expectations/mod_path.tag.c b/tests/expectations/mod_path_tag.c
similarity index 100%
rename from tests/expectations/mod_path.tag.c
rename to tests/expectations/mod_path_tag.c
diff --git a/tests/expectations/mod_path.tag.compat.c b/tests/expectations/mod_path_tag.compat.c
similarity index 100%
rename from tests/expectations/mod_path.tag.compat.c
rename to tests/expectations/mod_path_tag.compat.c
diff --git a/tests/expectations/mod_path.tag.pyx b/tests/expectations/mod_path_tag.pyx
similarity index 100%
rename from tests/expectations/mod_path.tag.pyx
rename to tests/expectations/mod_path_tag.pyx
diff --git a/tests/expectations/monomorph_1.both.c b/tests/expectations/monomorph_1_both.c
similarity index 100%
rename from tests/expectations/monomorph_1.both.c
rename to tests/expectations/monomorph_1_both.c
diff --git a/tests/expectations/monomorph_1.both.compat.c b/tests/expectations/monomorph_1_both.compat.c
similarity index 100%
rename from tests/expectations/monomorph_1.both.compat.c
rename to tests/expectations/monomorph_1_both.compat.c
diff --git a/tests/expectations/monomorph_1.tag.c b/tests/expectations/monomorph_1_tag.c
similarity index 100%
rename from tests/expectations/monomorph_1.tag.c
rename to tests/expectations/monomorph_1_tag.c
diff --git a/tests/expectations/monomorph_1.tag.compat.c b/tests/expectations/monomorph_1_tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph_1.tag.compat.c
rename to tests/expectations/monomorph_1_tag.compat.c
diff --git a/tests/expectations/monomorph_1.tag.pyx b/tests/expectations/monomorph_1_tag.pyx
similarity index 100%
rename from tests/expectations/monomorph_1.tag.pyx
rename to tests/expectations/monomorph_1_tag.pyx
diff --git a/tests/expectations/monomorph_2.both.c b/tests/expectations/monomorph_2_both.c
similarity index 100%
rename from tests/expectations/monomorph_2.both.c
rename to tests/expectations/monomorph_2_both.c
diff --git a/tests/expectations/monomorph_2.both.compat.c b/tests/expectations/monomorph_2_both.compat.c
similarity index 100%
rename from tests/expectations/monomorph_2.both.compat.c
rename to tests/expectations/monomorph_2_both.compat.c
diff --git a/tests/expectations/monomorph_2.tag.c b/tests/expectations/monomorph_2_tag.c
similarity index 100%
rename from tests/expectations/monomorph_2.tag.c
rename to tests/expectations/monomorph_2_tag.c
diff --git a/tests/expectations/monomorph_2.tag.compat.c b/tests/expectations/monomorph_2_tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph_2.tag.compat.c
rename to tests/expectations/monomorph_2_tag.compat.c
diff --git a/tests/expectations/monomorph_2.tag.pyx b/tests/expectations/monomorph_2_tag.pyx
similarity index 100%
rename from tests/expectations/monomorph_2.tag.pyx
rename to tests/expectations/monomorph_2_tag.pyx
diff --git a/tests/expectations/monomorph_3.both.c b/tests/expectations/monomorph_3_both.c
similarity index 100%
rename from tests/expectations/monomorph_3.both.c
rename to tests/expectations/monomorph_3_both.c
diff --git a/tests/expectations/monomorph_3.both.compat.c b/tests/expectations/monomorph_3_both.compat.c
similarity index 100%
rename from tests/expectations/monomorph_3.both.compat.c
rename to tests/expectations/monomorph_3_both.compat.c
diff --git a/tests/expectations/monomorph_3.tag.c b/tests/expectations/monomorph_3_tag.c
similarity index 100%
rename from tests/expectations/monomorph_3.tag.c
rename to tests/expectations/monomorph_3_tag.c
diff --git a/tests/expectations/monomorph_3.tag.compat.c b/tests/expectations/monomorph_3_tag.compat.c
similarity index 100%
rename from tests/expectations/monomorph_3.tag.compat.c
rename to tests/expectations/monomorph_3_tag.compat.c
diff --git a/tests/expectations/monomorph_3.tag.pyx b/tests/expectations/monomorph_3_tag.pyx
similarity index 100%
rename from tests/expectations/monomorph_3.tag.pyx
rename to tests/expectations/monomorph_3_tag.pyx
diff --git a/tests/expectations/must_use.both.c b/tests/expectations/must_use_both.c
similarity index 100%
rename from tests/expectations/must_use.both.c
rename to tests/expectations/must_use_both.c
diff --git a/tests/expectations/must_use.both.compat.c b/tests/expectations/must_use_both.compat.c
similarity index 100%
rename from tests/expectations/must_use.both.compat.c
rename to tests/expectations/must_use_both.compat.c
diff --git a/tests/expectations/must_use.tag.c b/tests/expectations/must_use_tag.c
similarity index 100%
rename from tests/expectations/must_use.tag.c
rename to tests/expectations/must_use_tag.c
diff --git a/tests/expectations/must_use.tag.compat.c b/tests/expectations/must_use_tag.compat.c
similarity index 100%
rename from tests/expectations/must_use.tag.compat.c
rename to tests/expectations/must_use_tag.compat.c
diff --git a/tests/expectations/must_use.tag.pyx b/tests/expectations/must_use_tag.pyx
similarity index 100%
rename from tests/expectations/must_use.tag.pyx
rename to tests/expectations/must_use_tag.pyx
diff --git a/tests/expectations/namespace_constant.both.c b/tests/expectations/namespace_constant_both.c
similarity index 100%
rename from tests/expectations/namespace_constant.both.c
rename to tests/expectations/namespace_constant_both.c
diff --git a/tests/expectations/namespace_constant.both.compat.c b/tests/expectations/namespace_constant_both.compat.c
similarity index 100%
rename from tests/expectations/namespace_constant.both.compat.c
rename to tests/expectations/namespace_constant_both.compat.c
diff --git a/tests/expectations/namespace_constant.tag.c b/tests/expectations/namespace_constant_tag.c
similarity index 100%
rename from tests/expectations/namespace_constant.tag.c
rename to tests/expectations/namespace_constant_tag.c
diff --git a/tests/expectations/namespace_constant.tag.compat.c b/tests/expectations/namespace_constant_tag.compat.c
similarity index 100%
rename from tests/expectations/namespace_constant.tag.compat.c
rename to tests/expectations/namespace_constant_tag.compat.c
diff --git a/tests/expectations/namespace_constant.tag.pyx b/tests/expectations/namespace_constant_tag.pyx
similarity index 100%
rename from tests/expectations/namespace_constant.tag.pyx
rename to tests/expectations/namespace_constant_tag.pyx
diff --git a/tests/expectations/namespaces_constant.both.c b/tests/expectations/namespaces_constant_both.c
similarity index 100%
rename from tests/expectations/namespaces_constant.both.c
rename to tests/expectations/namespaces_constant_both.c
diff --git a/tests/expectations/namespaces_constant.both.compat.c b/tests/expectations/namespaces_constant_both.compat.c
similarity index 100%
rename from tests/expectations/namespaces_constant.both.compat.c
rename to tests/expectations/namespaces_constant_both.compat.c
diff --git a/tests/expectations/namespaces_constant.tag.c b/tests/expectations/namespaces_constant_tag.c
similarity index 100%
rename from tests/expectations/namespaces_constant.tag.c
rename to tests/expectations/namespaces_constant_tag.c
diff --git a/tests/expectations/namespaces_constant.tag.compat.c b/tests/expectations/namespaces_constant_tag.compat.c
similarity index 100%
rename from tests/expectations/namespaces_constant.tag.compat.c
rename to tests/expectations/namespaces_constant_tag.compat.c
diff --git a/tests/expectations/namespaces_constant.tag.pyx b/tests/expectations/namespaces_constant_tag.pyx
similarity index 100%
rename from tests/expectations/namespaces_constant.tag.pyx
rename to tests/expectations/namespaces_constant_tag.pyx
diff --git a/tests/expectations/nonnull_attribute.both.c b/tests/expectations/nonnull_attribute_both.c
similarity index 100%
rename from tests/expectations/nonnull_attribute.both.c
rename to tests/expectations/nonnull_attribute_both.c
diff --git a/tests/expectations/nonnull_attribute.both.compat.c b/tests/expectations/nonnull_attribute_both.compat.c
similarity index 100%
rename from tests/expectations/nonnull_attribute.both.compat.c
rename to tests/expectations/nonnull_attribute_both.compat.c
diff --git a/tests/expectations/nonnull_attribute.tag.c b/tests/expectations/nonnull_attribute_tag.c
similarity index 100%
rename from tests/expectations/nonnull_attribute.tag.c
rename to tests/expectations/nonnull_attribute_tag.c
diff --git a/tests/expectations/nonnull_attribute.tag.compat.c b/tests/expectations/nonnull_attribute_tag.compat.c
similarity index 100%
rename from tests/expectations/nonnull_attribute.tag.compat.c
rename to tests/expectations/nonnull_attribute_tag.compat.c
diff --git a/tests/expectations/nonnull_attribute.tag.pyx b/tests/expectations/nonnull_attribute_tag.pyx
similarity index 100%
rename from tests/expectations/nonnull_attribute.tag.pyx
rename to tests/expectations/nonnull_attribute_tag.pyx
diff --git a/tests/expectations/nonnull.both.c b/tests/expectations/nonnull_both.c
similarity index 100%
rename from tests/expectations/nonnull.both.c
rename to tests/expectations/nonnull_both.c
diff --git a/tests/expectations/nonnull.both.compat.c b/tests/expectations/nonnull_both.compat.c
similarity index 100%
rename from tests/expectations/nonnull.both.compat.c
rename to tests/expectations/nonnull_both.compat.c
diff --git a/tests/expectations/nonnull.tag.c b/tests/expectations/nonnull_tag.c
similarity index 100%
rename from tests/expectations/nonnull.tag.c
rename to tests/expectations/nonnull_tag.c
diff --git a/tests/expectations/nonnull.tag.compat.c b/tests/expectations/nonnull_tag.compat.c
similarity index 100%
rename from tests/expectations/nonnull.tag.compat.c
rename to tests/expectations/nonnull_tag.compat.c
diff --git a/tests/expectations/nonnull.tag.pyx b/tests/expectations/nonnull_tag.pyx
similarity index 100%
rename from tests/expectations/nonnull.tag.pyx
rename to tests/expectations/nonnull_tag.pyx
diff --git a/tests/expectations/nonzero.both.c b/tests/expectations/nonzero_both.c
similarity index 100%
rename from tests/expectations/nonzero.both.c
rename to tests/expectations/nonzero_both.c
diff --git a/tests/expectations/nonzero.both.compat.c b/tests/expectations/nonzero_both.compat.c
similarity index 100%
rename from tests/expectations/nonzero.both.compat.c
rename to tests/expectations/nonzero_both.compat.c
diff --git a/tests/expectations/nonzero.tag.c b/tests/expectations/nonzero_tag.c
similarity index 100%
rename from tests/expectations/nonzero.tag.c
rename to tests/expectations/nonzero_tag.c
diff --git a/tests/expectations/nonzero.tag.compat.c b/tests/expectations/nonzero_tag.compat.c
similarity index 100%
rename from tests/expectations/nonzero.tag.compat.c
rename to tests/expectations/nonzero_tag.compat.c
diff --git a/tests/expectations/nonzero.tag.pyx b/tests/expectations/nonzero_tag.pyx
similarity index 100%
rename from tests/expectations/nonzero.tag.pyx
rename to tests/expectations/nonzero_tag.pyx
diff --git a/tests/expectations/opaque.both.c b/tests/expectations/opaque_both.c
similarity index 100%
rename from tests/expectations/opaque.both.c
rename to tests/expectations/opaque_both.c
diff --git a/tests/expectations/opaque.both.compat.c b/tests/expectations/opaque_both.compat.c
similarity index 100%
rename from tests/expectations/opaque.both.compat.c
rename to tests/expectations/opaque_both.compat.c
diff --git a/tests/expectations/opaque.tag.c b/tests/expectations/opaque_tag.c
similarity index 100%
rename from tests/expectations/opaque.tag.c
rename to tests/expectations/opaque_tag.c
diff --git a/tests/expectations/opaque.tag.compat.c b/tests/expectations/opaque_tag.compat.c
similarity index 100%
rename from tests/expectations/opaque.tag.compat.c
rename to tests/expectations/opaque_tag.compat.c
diff --git a/tests/expectations/opaque.tag.pyx b/tests/expectations/opaque_tag.pyx
similarity index 100%
rename from tests/expectations/opaque.tag.pyx
rename to tests/expectations/opaque_tag.pyx
diff --git a/tests/expectations/pin.both.c b/tests/expectations/pin_both.c
similarity index 100%
rename from tests/expectations/pin.both.c
rename to tests/expectations/pin_both.c
diff --git a/tests/expectations/pin.both.compat.c b/tests/expectations/pin_both.compat.c
similarity index 100%
rename from tests/expectations/pin.both.compat.c
rename to tests/expectations/pin_both.compat.c
diff --git a/tests/expectations/pin.tag.c b/tests/expectations/pin_tag.c
similarity index 100%
rename from tests/expectations/pin.tag.c
rename to tests/expectations/pin_tag.c
diff --git a/tests/expectations/pin.tag.compat.c b/tests/expectations/pin_tag.compat.c
similarity index 100%
rename from tests/expectations/pin.tag.compat.c
rename to tests/expectations/pin_tag.compat.c
diff --git a/tests/expectations/pin.tag.pyx b/tests/expectations/pin_tag.pyx
similarity index 100%
rename from tests/expectations/pin.tag.pyx
rename to tests/expectations/pin_tag.pyx
diff --git a/tests/expectations/prefix.both.c b/tests/expectations/prefix_both.c
similarity index 100%
rename from tests/expectations/prefix.both.c
rename to tests/expectations/prefix_both.c
diff --git a/tests/expectations/prefix.both.compat.c b/tests/expectations/prefix_both.compat.c
similarity index 100%
rename from tests/expectations/prefix.both.compat.c
rename to tests/expectations/prefix_both.compat.c
diff --git a/tests/expectations/prefix.tag.c b/tests/expectations/prefix_tag.c
similarity index 100%
rename from tests/expectations/prefix.tag.c
rename to tests/expectations/prefix_tag.c
diff --git a/tests/expectations/prefix.tag.compat.c b/tests/expectations/prefix_tag.compat.c
similarity index 100%
rename from tests/expectations/prefix.tag.compat.c
rename to tests/expectations/prefix_tag.compat.c
diff --git a/tests/expectations/prefix.tag.pyx b/tests/expectations/prefix_tag.pyx
similarity index 100%
rename from tests/expectations/prefix.tag.pyx
rename to tests/expectations/prefix_tag.pyx
diff --git a/tests/expectations/prefixed_struct_literal.both.c b/tests/expectations/prefixed_struct_literal_both.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal.both.c
rename to tests/expectations/prefixed_struct_literal_both.c
diff --git a/tests/expectations/prefixed_struct_literal.both.compat.c b/tests/expectations/prefixed_struct_literal_both.compat.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal.both.compat.c
rename to tests/expectations/prefixed_struct_literal_both.compat.c
diff --git a/tests/expectations/prefixed_struct_literal_deep.both.c b/tests/expectations/prefixed_struct_literal_deep_both.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal_deep.both.c
rename to tests/expectations/prefixed_struct_literal_deep_both.c
diff --git a/tests/expectations/prefixed_struct_literal_deep.both.compat.c b/tests/expectations/prefixed_struct_literal_deep_both.compat.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal_deep.both.compat.c
rename to tests/expectations/prefixed_struct_literal_deep_both.compat.c
diff --git a/tests/expectations/prefixed_struct_literal_deep.tag.c b/tests/expectations/prefixed_struct_literal_deep_tag.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal_deep.tag.c
rename to tests/expectations/prefixed_struct_literal_deep_tag.c
diff --git a/tests/expectations/prefixed_struct_literal_deep.tag.compat.c b/tests/expectations/prefixed_struct_literal_deep_tag.compat.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal_deep.tag.compat.c
rename to tests/expectations/prefixed_struct_literal_deep_tag.compat.c
diff --git a/tests/expectations/prefixed_struct_literal_deep.tag.pyx b/tests/expectations/prefixed_struct_literal_deep_tag.pyx
similarity index 100%
rename from tests/expectations/prefixed_struct_literal_deep.tag.pyx
rename to tests/expectations/prefixed_struct_literal_deep_tag.pyx
diff --git a/tests/expectations/prefixed_struct_literal.tag.c b/tests/expectations/prefixed_struct_literal_tag.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal.tag.c
rename to tests/expectations/prefixed_struct_literal_tag.c
diff --git a/tests/expectations/prefixed_struct_literal.tag.compat.c b/tests/expectations/prefixed_struct_literal_tag.compat.c
similarity index 100%
rename from tests/expectations/prefixed_struct_literal.tag.compat.c
rename to tests/expectations/prefixed_struct_literal_tag.compat.c
diff --git a/tests/expectations/prefixed_struct_literal.tag.pyx b/tests/expectations/prefixed_struct_literal_tag.pyx
similarity index 100%
rename from tests/expectations/prefixed_struct_literal.tag.pyx
rename to tests/expectations/prefixed_struct_literal_tag.pyx
diff --git a/tests/expectations/raw_ident.both.c b/tests/expectations/raw_ident_both.c
similarity index 100%
rename from tests/expectations/raw_ident.both.c
rename to tests/expectations/raw_ident_both.c
diff --git a/tests/expectations/raw_ident.both.compat.c b/tests/expectations/raw_ident_both.compat.c
similarity index 100%
rename from tests/expectations/raw_ident.both.compat.c
rename to tests/expectations/raw_ident_both.compat.c
diff --git a/tests/expectations/raw_ident.tag.c b/tests/expectations/raw_ident_tag.c
similarity index 100%
rename from tests/expectations/raw_ident.tag.c
rename to tests/expectations/raw_ident_tag.c
diff --git a/tests/expectations/raw_ident.tag.compat.c b/tests/expectations/raw_ident_tag.compat.c
similarity index 100%
rename from tests/expectations/raw_ident.tag.compat.c
rename to tests/expectations/raw_ident_tag.compat.c
diff --git a/tests/expectations/raw_ident.tag.pyx b/tests/expectations/raw_ident_tag.pyx
similarity index 100%
rename from tests/expectations/raw_ident.tag.pyx
rename to tests/expectations/raw_ident_tag.pyx
diff --git a/tests/expectations/rename.both.c b/tests/expectations/rename_both.c
similarity index 100%
rename from tests/expectations/rename.both.c
rename to tests/expectations/rename_both.c
diff --git a/tests/expectations/rename.both.compat.c b/tests/expectations/rename_both.compat.c
similarity index 100%
rename from tests/expectations/rename.both.compat.c
rename to tests/expectations/rename_both.compat.c
diff --git a/tests/expectations/rename_crate.both.c b/tests/expectations/rename_crate_both.c
similarity index 100%
rename from tests/expectations/rename_crate.both.c
rename to tests/expectations/rename_crate_both.c
diff --git a/tests/expectations/rename_crate.both.compat.c b/tests/expectations/rename_crate_both.compat.c
similarity index 100%
rename from tests/expectations/rename_crate.both.compat.c
rename to tests/expectations/rename_crate_both.compat.c
diff --git a/tests/expectations/rename_crate.tag.c b/tests/expectations/rename_crate_tag.c
similarity index 100%
rename from tests/expectations/rename_crate.tag.c
rename to tests/expectations/rename_crate_tag.c
diff --git a/tests/expectations/rename_crate.tag.compat.c b/tests/expectations/rename_crate_tag.compat.c
similarity index 100%
rename from tests/expectations/rename_crate.tag.compat.c
rename to tests/expectations/rename_crate_tag.compat.c
diff --git a/tests/expectations/rename_crate.tag.pyx b/tests/expectations/rename_crate_tag.pyx
similarity index 100%
rename from tests/expectations/rename_crate.tag.pyx
rename to tests/expectations/rename_crate_tag.pyx
diff --git a/tests/expectations/rename.tag.c b/tests/expectations/rename_tag.c
similarity index 100%
rename from tests/expectations/rename.tag.c
rename to tests/expectations/rename_tag.c
diff --git a/tests/expectations/rename.tag.compat.c b/tests/expectations/rename_tag.compat.c
similarity index 100%
rename from tests/expectations/rename.tag.compat.c
rename to tests/expectations/rename_tag.compat.c
diff --git a/tests/expectations/rename.tag.pyx b/tests/expectations/rename_tag.pyx
similarity index 100%
rename from tests/expectations/rename.tag.pyx
rename to tests/expectations/rename_tag.pyx
diff --git a/tests/expectations/renaming_overrides_prefixing.both.c b/tests/expectations/renaming_overrides_prefixing_both.c
similarity index 100%
rename from tests/expectations/renaming_overrides_prefixing.both.c
rename to tests/expectations/renaming_overrides_prefixing_both.c
diff --git a/tests/expectations/renaming_overrides_prefixing.both.compat.c b/tests/expectations/renaming_overrides_prefixing_both.compat.c
similarity index 100%
rename from tests/expectations/renaming_overrides_prefixing.both.compat.c
rename to tests/expectations/renaming_overrides_prefixing_both.compat.c
diff --git a/tests/expectations/renaming_overrides_prefixing.tag.c b/tests/expectations/renaming_overrides_prefixing_tag.c
similarity index 100%
rename from tests/expectations/renaming_overrides_prefixing.tag.c
rename to tests/expectations/renaming_overrides_prefixing_tag.c
diff --git a/tests/expectations/renaming_overrides_prefixing.tag.compat.c b/tests/expectations/renaming_overrides_prefixing_tag.compat.c
similarity index 100%
rename from tests/expectations/renaming_overrides_prefixing.tag.compat.c
rename to tests/expectations/renaming_overrides_prefixing_tag.compat.c
diff --git a/tests/expectations/renaming_overrides_prefixing.tag.pyx b/tests/expectations/renaming_overrides_prefixing_tag.pyx
similarity index 100%
rename from tests/expectations/renaming_overrides_prefixing.tag.pyx
rename to tests/expectations/renaming_overrides_prefixing_tag.pyx
diff --git a/tests/expectations/reserved.both.c b/tests/expectations/reserved_both.c
similarity index 100%
rename from tests/expectations/reserved.both.c
rename to tests/expectations/reserved_both.c
diff --git a/tests/expectations/reserved.both.compat.c b/tests/expectations/reserved_both.compat.c
similarity index 100%
rename from tests/expectations/reserved.both.compat.c
rename to tests/expectations/reserved_both.compat.c
diff --git a/tests/expectations/reserved.tag.c b/tests/expectations/reserved_tag.c
similarity index 100%
rename from tests/expectations/reserved.tag.c
rename to tests/expectations/reserved_tag.c
diff --git a/tests/expectations/reserved.tag.compat.c b/tests/expectations/reserved_tag.compat.c
similarity index 100%
rename from tests/expectations/reserved.tag.compat.c
rename to tests/expectations/reserved_tag.compat.c
diff --git a/tests/expectations/reserved.tag.pyx b/tests/expectations/reserved_tag.pyx
similarity index 100%
rename from tests/expectations/reserved.tag.pyx
rename to tests/expectations/reserved_tag.pyx
diff --git a/tests/expectations/sentinel.both.c b/tests/expectations/sentinel_both.c
similarity index 100%
rename from tests/expectations/sentinel.both.c
rename to tests/expectations/sentinel_both.c
diff --git a/tests/expectations/sentinel.both.compat.c b/tests/expectations/sentinel_both.compat.c
similarity index 100%
rename from tests/expectations/sentinel.both.compat.c
rename to tests/expectations/sentinel_both.compat.c
diff --git a/tests/expectations/sentinel.tag.c b/tests/expectations/sentinel_tag.c
similarity index 100%
rename from tests/expectations/sentinel.tag.c
rename to tests/expectations/sentinel_tag.c
diff --git a/tests/expectations/sentinel.tag.compat.c b/tests/expectations/sentinel_tag.compat.c
similarity index 100%
rename from tests/expectations/sentinel.tag.compat.c
rename to tests/expectations/sentinel_tag.compat.c
diff --git a/tests/expectations/sentinel.tag.pyx b/tests/expectations/sentinel_tag.pyx
similarity index 100%
rename from tests/expectations/sentinel.tag.pyx
rename to tests/expectations/sentinel_tag.pyx
diff --git a/tests/expectations/simplify_option_ptr.both.c b/tests/expectations/simplify_option_ptr_both.c
similarity index 100%
rename from tests/expectations/simplify_option_ptr.both.c
rename to tests/expectations/simplify_option_ptr_both.c
diff --git a/tests/expectations/simplify_option_ptr.both.compat.c b/tests/expectations/simplify_option_ptr_both.compat.c
similarity index 100%
rename from tests/expectations/simplify_option_ptr.both.compat.c
rename to tests/expectations/simplify_option_ptr_both.compat.c
diff --git a/tests/expectations/simplify_option_ptr.tag.c b/tests/expectations/simplify_option_ptr_tag.c
similarity index 100%
rename from tests/expectations/simplify_option_ptr.tag.c
rename to tests/expectations/simplify_option_ptr_tag.c
diff --git a/tests/expectations/simplify_option_ptr.tag.compat.c b/tests/expectations/simplify_option_ptr_tag.compat.c
similarity index 100%
rename from tests/expectations/simplify_option_ptr.tag.compat.c
rename to tests/expectations/simplify_option_ptr_tag.compat.c
diff --git a/tests/expectations/simplify_option_ptr.tag.pyx b/tests/expectations/simplify_option_ptr_tag.pyx
similarity index 100%
rename from tests/expectations/simplify_option_ptr.tag.pyx
rename to tests/expectations/simplify_option_ptr_tag.pyx
diff --git a/tests/expectations/static.both.c b/tests/expectations/static_both.c
similarity index 100%
rename from tests/expectations/static.both.c
rename to tests/expectations/static_both.c
diff --git a/tests/expectations/static.both.compat.c b/tests/expectations/static_both.compat.c
similarity index 100%
rename from tests/expectations/static.both.compat.c
rename to tests/expectations/static_both.compat.c
diff --git a/tests/expectations/static.tag.c b/tests/expectations/static_tag.c
similarity index 100%
rename from tests/expectations/static.tag.c
rename to tests/expectations/static_tag.c
diff --git a/tests/expectations/static.tag.compat.c b/tests/expectations/static_tag.compat.c
similarity index 100%
rename from tests/expectations/static.tag.compat.c
rename to tests/expectations/static_tag.compat.c
diff --git a/tests/expectations/static.tag.pyx b/tests/expectations/static_tag.pyx
similarity index 100%
rename from tests/expectations/static.tag.pyx
rename to tests/expectations/static_tag.pyx
diff --git a/tests/expectations/std_lib.both.c b/tests/expectations/std_lib_both.c
similarity index 100%
rename from tests/expectations/std_lib.both.c
rename to tests/expectations/std_lib_both.c
diff --git a/tests/expectations/std_lib.both.compat.c b/tests/expectations/std_lib_both.compat.c
similarity index 100%
rename from tests/expectations/std_lib.both.compat.c
rename to tests/expectations/std_lib_both.compat.c
diff --git a/tests/expectations/std_lib.tag.c b/tests/expectations/std_lib_tag.c
similarity index 100%
rename from tests/expectations/std_lib.tag.c
rename to tests/expectations/std_lib_tag.c
diff --git a/tests/expectations/std_lib.tag.compat.c b/tests/expectations/std_lib_tag.compat.c
similarity index 100%
rename from tests/expectations/std_lib.tag.compat.c
rename to tests/expectations/std_lib_tag.compat.c
diff --git a/tests/expectations/std_lib.tag.pyx b/tests/expectations/std_lib_tag.pyx
similarity index 100%
rename from tests/expectations/std_lib.tag.pyx
rename to tests/expectations/std_lib_tag.pyx
diff --git a/tests/expectations/struct.both.c b/tests/expectations/struct_both.c
similarity index 100%
rename from tests/expectations/struct.both.c
rename to tests/expectations/struct_both.c
diff --git a/tests/expectations/struct.both.compat.c b/tests/expectations/struct_both.compat.c
similarity index 100%
rename from tests/expectations/struct.both.compat.c
rename to tests/expectations/struct_both.compat.c
diff --git a/tests/expectations/struct_literal.both.c b/tests/expectations/struct_literal_both.c
similarity index 100%
rename from tests/expectations/struct_literal.both.c
rename to tests/expectations/struct_literal_both.c
diff --git a/tests/expectations/struct_literal.both.compat.c b/tests/expectations/struct_literal_both.compat.c
similarity index 100%
rename from tests/expectations/struct_literal.both.compat.c
rename to tests/expectations/struct_literal_both.compat.c
diff --git a/tests/expectations/struct_literal_order.both.c b/tests/expectations/struct_literal_order_both.c
similarity index 100%
rename from tests/expectations/struct_literal_order.both.c
rename to tests/expectations/struct_literal_order_both.c
diff --git a/tests/expectations/struct_literal_order.both.compat.c b/tests/expectations/struct_literal_order_both.compat.c
similarity index 100%
rename from tests/expectations/struct_literal_order.both.compat.c
rename to tests/expectations/struct_literal_order_both.compat.c
diff --git a/tests/expectations/struct_literal_order.tag.c b/tests/expectations/struct_literal_order_tag.c
similarity index 100%
rename from tests/expectations/struct_literal_order.tag.c
rename to tests/expectations/struct_literal_order_tag.c
diff --git a/tests/expectations/struct_literal_order.tag.compat.c b/tests/expectations/struct_literal_order_tag.compat.c
similarity index 100%
rename from tests/expectations/struct_literal_order.tag.compat.c
rename to tests/expectations/struct_literal_order_tag.compat.c
diff --git a/tests/expectations/struct_literal_order.tag.pyx b/tests/expectations/struct_literal_order_tag.pyx
similarity index 100%
rename from tests/expectations/struct_literal_order.tag.pyx
rename to tests/expectations/struct_literal_order_tag.pyx
diff --git a/tests/expectations/struct_literal.tag.c b/tests/expectations/struct_literal_tag.c
similarity index 100%
rename from tests/expectations/struct_literal.tag.c
rename to tests/expectations/struct_literal_tag.c
diff --git a/tests/expectations/struct_literal.tag.compat.c b/tests/expectations/struct_literal_tag.compat.c
similarity index 100%
rename from tests/expectations/struct_literal.tag.compat.c
rename to tests/expectations/struct_literal_tag.compat.c
diff --git a/tests/expectations/struct_literal.tag.pyx b/tests/expectations/struct_literal_tag.pyx
similarity index 100%
rename from tests/expectations/struct_literal.tag.pyx
rename to tests/expectations/struct_literal_tag.pyx
diff --git a/tests/expectations/struct_self.both.c b/tests/expectations/struct_self_both.c
similarity index 100%
rename from tests/expectations/struct_self.both.c
rename to tests/expectations/struct_self_both.c
diff --git a/tests/expectations/struct_self.both.compat.c b/tests/expectations/struct_self_both.compat.c
similarity index 100%
rename from tests/expectations/struct_self.both.compat.c
rename to tests/expectations/struct_self_both.compat.c
diff --git a/tests/expectations/struct_self.tag.c b/tests/expectations/struct_self_tag.c
similarity index 100%
rename from tests/expectations/struct_self.tag.c
rename to tests/expectations/struct_self_tag.c
diff --git a/tests/expectations/struct_self.tag.compat.c b/tests/expectations/struct_self_tag.compat.c
similarity index 100%
rename from tests/expectations/struct_self.tag.compat.c
rename to tests/expectations/struct_self_tag.compat.c
diff --git a/tests/expectations/struct_self.tag.pyx b/tests/expectations/struct_self_tag.pyx
similarity index 100%
rename from tests/expectations/struct_self.tag.pyx
rename to tests/expectations/struct_self_tag.pyx
diff --git a/tests/expectations/struct.tag.c b/tests/expectations/struct_tag.c
similarity index 100%
rename from tests/expectations/struct.tag.c
rename to tests/expectations/struct_tag.c
diff --git a/tests/expectations/struct.tag.compat.c b/tests/expectations/struct_tag.compat.c
similarity index 100%
rename from tests/expectations/struct.tag.compat.c
rename to tests/expectations/struct_tag.compat.c
diff --git a/tests/expectations/struct.tag.pyx b/tests/expectations/struct_tag.pyx
similarity index 100%
rename from tests/expectations/struct.tag.pyx
rename to tests/expectations/struct_tag.pyx
diff --git a/tests/expectations/swift_name.both.c b/tests/expectations/swift_name_both.c
similarity index 100%
rename from tests/expectations/swift_name.both.c
rename to tests/expectations/swift_name_both.c
diff --git a/tests/expectations/swift_name.both.compat.c b/tests/expectations/swift_name_both.compat.c
similarity index 100%
rename from tests/expectations/swift_name.both.compat.c
rename to tests/expectations/swift_name_both.compat.c
diff --git a/tests/expectations/swift_name.tag.c b/tests/expectations/swift_name_tag.c
similarity index 100%
rename from tests/expectations/swift_name.tag.c
rename to tests/expectations/swift_name_tag.c
diff --git a/tests/expectations/swift_name.tag.compat.c b/tests/expectations/swift_name_tag.compat.c
similarity index 100%
rename from tests/expectations/swift_name.tag.compat.c
rename to tests/expectations/swift_name_tag.compat.c
diff --git a/tests/expectations/swift_name.tag.pyx b/tests/expectations/swift_name_tag.pyx
similarity index 100%
rename from tests/expectations/swift_name.tag.pyx
rename to tests/expectations/swift_name_tag.pyx
diff --git a/tests/expectations/transform_op.both.c b/tests/expectations/transform_op_both.c
similarity index 100%
rename from tests/expectations/transform_op.both.c
rename to tests/expectations/transform_op_both.c
diff --git a/tests/expectations/transform_op.both.compat.c b/tests/expectations/transform_op_both.compat.c
similarity index 100%
rename from tests/expectations/transform_op.both.compat.c
rename to tests/expectations/transform_op_both.compat.c
diff --git a/tests/expectations/transform_op.tag.c b/tests/expectations/transform_op_tag.c
similarity index 100%
rename from tests/expectations/transform_op.tag.c
rename to tests/expectations/transform_op_tag.c
diff --git a/tests/expectations/transform_op.tag.compat.c b/tests/expectations/transform_op_tag.compat.c
similarity index 100%
rename from tests/expectations/transform_op.tag.compat.c
rename to tests/expectations/transform_op_tag.compat.c
diff --git a/tests/expectations/transform_op.tag.pyx b/tests/expectations/transform_op_tag.pyx
similarity index 100%
rename from tests/expectations/transform_op.tag.pyx
rename to tests/expectations/transform_op_tag.pyx
diff --git a/tests/expectations/transparent.both.c b/tests/expectations/transparent_both.c
similarity index 100%
rename from tests/expectations/transparent.both.c
rename to tests/expectations/transparent_both.c
diff --git a/tests/expectations/transparent.both.compat.c b/tests/expectations/transparent_both.compat.c
similarity index 100%
rename from tests/expectations/transparent.both.compat.c
rename to tests/expectations/transparent_both.compat.c
diff --git a/tests/expectations/transparent.tag.c b/tests/expectations/transparent_tag.c
similarity index 100%
rename from tests/expectations/transparent.tag.c
rename to tests/expectations/transparent_tag.c
diff --git a/tests/expectations/transparent.tag.compat.c b/tests/expectations/transparent_tag.compat.c
similarity index 100%
rename from tests/expectations/transparent.tag.compat.c
rename to tests/expectations/transparent_tag.compat.c
diff --git a/tests/expectations/transparent.tag.pyx b/tests/expectations/transparent_tag.pyx
similarity index 100%
rename from tests/expectations/transparent.tag.pyx
rename to tests/expectations/transparent_tag.pyx
diff --git a/tests/expectations/typedef.both.c b/tests/expectations/typedef_both.c
similarity index 100%
rename from tests/expectations/typedef.both.c
rename to tests/expectations/typedef_both.c
diff --git a/tests/expectations/typedef.both.compat.c b/tests/expectations/typedef_both.compat.c
similarity index 100%
rename from tests/expectations/typedef.both.compat.c
rename to tests/expectations/typedef_both.compat.c
diff --git a/tests/expectations/typedef.tag.c b/tests/expectations/typedef_tag.c
similarity index 100%
rename from tests/expectations/typedef.tag.c
rename to tests/expectations/typedef_tag.c
diff --git a/tests/expectations/typedef.tag.compat.c b/tests/expectations/typedef_tag.compat.c
similarity index 100%
rename from tests/expectations/typedef.tag.compat.c
rename to tests/expectations/typedef_tag.compat.c
diff --git a/tests/expectations/typedef.tag.pyx b/tests/expectations/typedef_tag.pyx
similarity index 100%
rename from tests/expectations/typedef.tag.pyx
rename to tests/expectations/typedef_tag.pyx
diff --git a/tests/expectations/union.both.c b/tests/expectations/union_both.c
similarity index 100%
rename from tests/expectations/union.both.c
rename to tests/expectations/union_both.c
diff --git a/tests/expectations/union.both.compat.c b/tests/expectations/union_both.compat.c
similarity index 100%
rename from tests/expectations/union.both.compat.c
rename to tests/expectations/union_both.compat.c
diff --git a/tests/expectations/union_self.both.c b/tests/expectations/union_self_both.c
similarity index 100%
rename from tests/expectations/union_self.both.c
rename to tests/expectations/union_self_both.c
diff --git a/tests/expectations/union_self.both.compat.c b/tests/expectations/union_self_both.compat.c
similarity index 100%
rename from tests/expectations/union_self.both.compat.c
rename to tests/expectations/union_self_both.compat.c
diff --git a/tests/expectations/union_self.tag.c b/tests/expectations/union_self_tag.c
similarity index 100%
rename from tests/expectations/union_self.tag.c
rename to tests/expectations/union_self_tag.c
diff --git a/tests/expectations/union_self.tag.compat.c b/tests/expectations/union_self_tag.compat.c
similarity index 100%
rename from tests/expectations/union_self.tag.compat.c
rename to tests/expectations/union_self_tag.compat.c
diff --git a/tests/expectations/union_self.tag.pyx b/tests/expectations/union_self_tag.pyx
similarity index 100%
rename from tests/expectations/union_self.tag.pyx
rename to tests/expectations/union_self_tag.pyx
diff --git a/tests/expectations/union.tag.c b/tests/expectations/union_tag.c
similarity index 100%
rename from tests/expectations/union.tag.c
rename to tests/expectations/union_tag.c
diff --git a/tests/expectations/union.tag.compat.c b/tests/expectations/union_tag.compat.c
similarity index 100%
rename from tests/expectations/union.tag.compat.c
rename to tests/expectations/union_tag.compat.c
diff --git a/tests/expectations/union.tag.pyx b/tests/expectations/union_tag.pyx
similarity index 100%
rename from tests/expectations/union.tag.pyx
rename to tests/expectations/union_tag.pyx
diff --git a/tests/expectations/workspace.both.c b/tests/expectations/workspace_both.c
similarity index 100%
rename from tests/expectations/workspace.both.c
rename to tests/expectations/workspace_both.c
diff --git a/tests/expectations/workspace.both.compat.c b/tests/expectations/workspace_both.compat.c
similarity index 100%
rename from tests/expectations/workspace.both.compat.c
rename to tests/expectations/workspace_both.compat.c
diff --git a/tests/expectations/workspace.tag.c b/tests/expectations/workspace_tag.c
similarity index 100%
rename from tests/expectations/workspace.tag.c
rename to tests/expectations/workspace_tag.c
diff --git a/tests/expectations/workspace.tag.compat.c b/tests/expectations/workspace_tag.compat.c
similarity index 100%
rename from tests/expectations/workspace.tag.compat.c
rename to tests/expectations/workspace_tag.compat.c
diff --git a/tests/expectations/workspace.tag.pyx b/tests/expectations/workspace_tag.pyx
similarity index 100%
rename from tests/expectations/workspace.tag.pyx
rename to tests/expectations/workspace_tag.pyx
diff --git a/tests/expectations/zst.both.c b/tests/expectations/zst_both.c
similarity index 100%
rename from tests/expectations/zst.both.c
rename to tests/expectations/zst_both.c
diff --git a/tests/expectations/zst.both.compat.c b/tests/expectations/zst_both.compat.c
similarity index 100%
rename from tests/expectations/zst.both.compat.c
rename to tests/expectations/zst_both.compat.c
diff --git a/tests/expectations/zst.tag.c b/tests/expectations/zst_tag.c
similarity index 100%
rename from tests/expectations/zst.tag.c
rename to tests/expectations/zst_tag.c
diff --git a/tests/expectations/zst.tag.compat.c b/tests/expectations/zst_tag.compat.c
similarity index 100%
rename from tests/expectations/zst.tag.compat.c
rename to tests/expectations/zst_tag.compat.c
diff --git a/tests/expectations/zst.tag.pyx b/tests/expectations/zst_tag.pyx
similarity index 100%
rename from tests/expectations/zst.tag.pyx
rename to tests/expectations/zst_tag.pyx
diff --git a/tests/tests.rs b/tests/tests.rs
index ec389d6e4..b0ee79c35 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -167,7 +167,9 @@ fn compile(
         Language::Cython => {
             command.arg("-Wextra");
             if !skip_warning_as_error {
-                command.arg("-Werror");
+                // Our tests contain code that is deprecated in Cython 3.0.
+                // Allowing warnings buys a little time.
+                // command.arg("-Werror");
             }
             command.arg("-3");
             command.arg("-o").arg(&object);
@@ -202,9 +204,10 @@ fn run_compile_test(
     fs::create_dir_all(&generated_file).unwrap();
 
     let style_ext = style
+        // Cython is sensitive to dots, so we can't include any dots.
         .map(|style| match style {
-            Style::Both => ".both",
-            Style::Tag => ".tag",
+            Style::Both => "_both",
+            Style::Tag => "_tag",
             Style::Type => "",
         })
         .unwrap_or_default();