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.c b/tests/expectations/asserted_cast.c
similarity index 100%
rename from tests/expectations/asserted-cast.c
rename to tests/expectations/asserted_cast.c
diff --git a/tests/expectations/asserted-cast.compat.c b/tests/expectations/asserted_cast.compat.c
similarity index 100%
rename from tests/expectations/asserted-cast.compat.c
rename to tests/expectations/asserted_cast.compat.c
diff --git a/tests/expectations/asserted-cast.cpp b/tests/expectations/asserted_cast.cpp
similarity index 100%
rename from tests/expectations/asserted-cast.cpp
rename to tests/expectations/asserted_cast.cpp
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/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.c b/tests/expectations/cfg_2.c
similarity index 100%
rename from tests/expectations/cfg-2.c
rename to tests/expectations/cfg_2.c
diff --git a/tests/expectations/cfg-2.compat.c b/tests/expectations/cfg_2.compat.c
similarity index 100%
rename from tests/expectations/cfg-2.compat.c
rename to tests/expectations/cfg_2.compat.c
diff --git a/tests/expectations/cfg-2.cpp b/tests/expectations/cfg_2.cpp
similarity index 100%
rename from tests/expectations/cfg-2.cpp
rename to tests/expectations/cfg_2.cpp
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-field.compat.c b/tests/expectations/cfg_field.compat.c
similarity index 100%
rename from tests/expectations/cfg-field.compat.c
rename to tests/expectations/cfg_field.compat.c
diff --git a/tests/expectations/cfg-field.cpp b/tests/expectations/cfg_field.cpp
similarity index 100%
rename from tests/expectations/cfg-field.cpp
rename to tests/expectations/cfg_field.cpp
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.c b/tests/expectations/derive_eq.c
similarity index 100%
rename from tests/expectations/derive-eq.c
rename to tests/expectations/derive_eq.c
diff --git a/tests/expectations/derive-eq.compat.c b/tests/expectations/derive_eq.compat.c
similarity index 100%
rename from tests/expectations/derive-eq.compat.c
rename to tests/expectations/derive_eq.compat.c
diff --git a/tests/expectations/derive-eq.cpp b/tests/expectations/derive_eq.cpp
similarity index 100%
rename from tests/expectations/derive-eq.cpp
rename to tests/expectations/derive_eq.cpp
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/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.c b/tests/expectations/destructor_and_copy_ctor.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.c
rename to tests/expectations/destructor_and_copy_ctor.c
diff --git a/tests/expectations/destructor-and-copy-ctor.compat.c b/tests/expectations/destructor_and_copy_ctor.compat.c
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.compat.c
rename to tests/expectations/destructor_and_copy_ctor.compat.c
diff --git a/tests/expectations/destructor-and-copy-ctor.cpp b/tests/expectations/destructor_and_copy_ctor.cpp
similarity index 100%
rename from tests/expectations/destructor-and-copy-ctor.cpp
rename to tests/expectations/destructor_and_copy_ctor.cpp
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/extern-2.c b/tests/expectations/extern_2.c
similarity index 100%
rename from tests/expectations/extern-2.c
rename to tests/expectations/extern_2.c
diff --git a/tests/expectations/extern-2.compat.c b/tests/expectations/extern_2.compat.c
similarity index 100%
rename from tests/expectations/extern-2.compat.c
rename to tests/expectations/extern_2.compat.c
diff --git a/tests/expectations/extern-2.cpp b/tests/expectations/extern_2.cpp
similarity index 100%
rename from tests/expectations/extern-2.cpp
rename to tests/expectations/extern_2.cpp
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.c b/tests/expectations/generic_pointer.c
similarity index 100%
rename from tests/expectations/generic-pointer.c
rename to tests/expectations/generic_pointer.c
diff --git a/tests/expectations/generic-pointer.compat.c b/tests/expectations/generic_pointer.compat.c
similarity index 100%
rename from tests/expectations/generic-pointer.compat.c
rename to tests/expectations/generic_pointer.compat.c
diff --git a/tests/expectations/generic-pointer.cpp b/tests/expectations/generic_pointer.cpp
similarity index 100%
rename from tests/expectations/generic-pointer.cpp
rename to tests/expectations/generic_pointer.cpp
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/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.c b/tests/expectations/monomorph_1.c
similarity index 100%
rename from tests/expectations/monomorph-1.c
rename to tests/expectations/monomorph_1.c
diff --git a/tests/expectations/monomorph-1.compat.c b/tests/expectations/monomorph_1.compat.c
similarity index 100%
rename from tests/expectations/monomorph-1.compat.c
rename to tests/expectations/monomorph_1.compat.c
diff --git a/tests/expectations/monomorph-1.cpp b/tests/expectations/monomorph_1.cpp
similarity index 100%
rename from tests/expectations/monomorph-1.cpp
rename to tests/expectations/monomorph_1.cpp
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-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.c b/tests/expectations/monomorph_2.c
similarity index 100%
rename from tests/expectations/monomorph-2.c
rename to tests/expectations/monomorph_2.c
diff --git a/tests/expectations/monomorph-2.compat.c b/tests/expectations/monomorph_2.compat.c
similarity index 100%
rename from tests/expectations/monomorph-2.compat.c
rename to tests/expectations/monomorph_2.compat.c
diff --git a/tests/expectations/monomorph-2.cpp b/tests/expectations/monomorph_2.cpp
similarity index 100%
rename from tests/expectations/monomorph-2.cpp
rename to tests/expectations/monomorph_2.cpp
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-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.c b/tests/expectations/monomorph_3.c
similarity index 100%
rename from tests/expectations/monomorph-3.c
rename to tests/expectations/monomorph_3.c
diff --git a/tests/expectations/monomorph-3.compat.c b/tests/expectations/monomorph_3.compat.c
similarity index 100%
rename from tests/expectations/monomorph-3.compat.c
rename to tests/expectations/monomorph_3.compat.c
diff --git a/tests/expectations/monomorph-3.cpp b/tests/expectations/monomorph_3.cpp
similarity index 100%
rename from tests/expectations/monomorph-3.cpp
rename to tests/expectations/monomorph_3.cpp
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/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.c b/tests/expectations/must_use.c
similarity index 100%
rename from tests/expectations/must-use.c
rename to tests/expectations/must_use.c
diff --git a/tests/expectations/must-use.compat.c b/tests/expectations/must_use.compat.c
similarity index 100%
rename from tests/expectations/must-use.compat.c
rename to tests/expectations/must_use.compat.c
diff --git a/tests/expectations/must-use.cpp b/tests/expectations/must_use.cpp
similarity index 100%
rename from tests/expectations/must-use.cpp
rename to tests/expectations/must_use.cpp
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/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.c b/tests/expectations/rename_crate.c
similarity index 100%
rename from tests/expectations/rename-crate.c
rename to tests/expectations/rename_crate.c
diff --git a/tests/expectations/rename-crate.compat.c b/tests/expectations/rename_crate.compat.c
similarity index 100%
rename from tests/expectations/rename-crate.compat.c
rename to tests/expectations/rename_crate.compat.c
diff --git a/tests/expectations/rename-crate.cpp b/tests/expectations/rename_crate.cpp
similarity index 100%
rename from tests/expectations/rename-crate.cpp
rename to tests/expectations/rename_crate.cpp
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/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.c b/tests/expectations/renaming_overrides_prefixing.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.c
rename to tests/expectations/renaming_overrides_prefixing.c
diff --git a/tests/expectations/renaming-overrides-prefixing.compat.c b/tests/expectations/renaming_overrides_prefixing.compat.c
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.compat.c
rename to tests/expectations/renaming_overrides_prefixing.compat.c
diff --git a/tests/expectations/renaming-overrides-prefixing.cpp b/tests/expectations/renaming_overrides_prefixing.cpp
similarity index 100%
rename from tests/expectations/renaming-overrides-prefixing.cpp
rename to tests/expectations/renaming_overrides_prefixing.cpp
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/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.c b/tests/expectations/simplify_option_ptr.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.c
rename to tests/expectations/simplify_option_ptr.c
diff --git a/tests/expectations/simplify-option-ptr.compat.c b/tests/expectations/simplify_option_ptr.compat.c
similarity index 100%
rename from tests/expectations/simplify-option-ptr.compat.c
rename to tests/expectations/simplify_option_ptr.compat.c
diff --git a/tests/expectations/simplify-option-ptr.cpp b/tests/expectations/simplify_option_ptr.cpp
similarity index 100%
rename from tests/expectations/simplify-option-ptr.cpp
rename to tests/expectations/simplify_option_ptr.cpp
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/size-types.c b/tests/expectations/size_types.c
similarity index 100%
rename from tests/expectations/size-types.c
rename to tests/expectations/size_types.c
diff --git a/tests/expectations/size-types.compat.c b/tests/expectations/size_types.compat.c
similarity index 100%
rename from tests/expectations/size-types.compat.c
rename to tests/expectations/size_types.compat.c
diff --git a/tests/expectations/size-types.cpp b/tests/expectations/size_types.cpp
similarity index 100%
rename from tests/expectations/size-types.cpp
rename to tests/expectations/size_types.cpp
diff --git a/tests/expectations/style-crash.compat.c b/tests/expectations/style_crash.compat.c
similarity index 100%
rename from tests/expectations/style-crash.compat.c
rename to tests/expectations/style_crash.compat.c
diff --git a/tests/expectations/style-crash.cpp b/tests/expectations/style_crash.cpp
similarity index 100%
rename from tests/expectations/style-crash.cpp
rename to tests/expectations/style_crash.cpp
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.c b/tests/expectations/transform_op.c
similarity index 100%
rename from tests/expectations/transform-op.c
rename to tests/expectations/transform_op.c
diff --git a/tests/expectations/transform-op.compat.c b/tests/expectations/transform_op.compat.c
similarity index 100%
rename from tests/expectations/transform-op.compat.c
rename to tests/expectations/transform_op.compat.c
diff --git a/tests/expectations/transform-op.cpp b/tests/expectations/transform_op.cpp
similarity index 100%
rename from tests/expectations/transform-op.cpp
rename to tests/expectations/transform_op.cpp
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/rust/asserted-cast.rs b/tests/rust/asserted_cast.rs
similarity index 100%
rename from tests/rust/asserted-cast.rs
rename to tests/rust/asserted_cast.rs
diff --git a/tests/rust/asserted-cast.toml b/tests/rust/asserted_cast.toml
similarity index 100%
rename from tests/rust/asserted-cast.toml
rename to tests/rust/asserted_cast.toml
diff --git a/tests/rust/cfg-2.rs b/tests/rust/cfg_2.rs
similarity index 100%
rename from tests/rust/cfg-2.rs
rename to tests/rust/cfg_2.rs
diff --git a/tests/rust/cfg-2.toml b/tests/rust/cfg_2.toml
similarity index 100%
rename from tests/rust/cfg-2.toml
rename to tests/rust/cfg_2.toml
diff --git a/tests/rust/cfg-field.rs b/tests/rust/cfg_field.rs
similarity index 100%
rename from tests/rust/cfg-field.rs
rename to tests/rust/cfg_field.rs
diff --git a/tests/rust/derive-eq/Cargo.lock b/tests/rust/derive_eq/Cargo.lock
similarity index 100%
rename from tests/rust/derive-eq/Cargo.lock
rename to tests/rust/derive_eq/Cargo.lock
diff --git a/tests/rust/derive-eq/Cargo.toml b/tests/rust/derive_eq/Cargo.toml
similarity index 100%
rename from tests/rust/derive-eq/Cargo.toml
rename to tests/rust/derive_eq/Cargo.toml
diff --git a/tests/rust/derive-eq/cbindgen.toml b/tests/rust/derive_eq/cbindgen.toml
similarity index 100%
rename from tests/rust/derive-eq/cbindgen.toml
rename to tests/rust/derive_eq/cbindgen.toml
diff --git a/tests/rust/derive-eq/src/lib.rs b/tests/rust/derive_eq/src/lib.rs
similarity index 100%
rename from tests/rust/derive-eq/src/lib.rs
rename to tests/rust/derive_eq/src/lib.rs
diff --git a/tests/rust/destructor-and-copy-ctor.rs b/tests/rust/destructor_and_copy_ctor.rs
similarity index 100%
rename from tests/rust/destructor-and-copy-ctor.rs
rename to tests/rust/destructor_and_copy_ctor.rs
diff --git a/tests/rust/destructor-and-copy-ctor.toml b/tests/rust/destructor_and_copy_ctor.toml
similarity index 100%
rename from tests/rust/destructor-and-copy-ctor.toml
rename to tests/rust/destructor_and_copy_ctor.toml
diff --git a/tests/rust/extern-2.rs b/tests/rust/extern_2.rs
similarity index 100%
rename from tests/rust/extern-2.rs
rename to tests/rust/extern_2.rs
diff --git a/tests/rust/generic-pointer.rs b/tests/rust/generic_pointer.rs
similarity index 100%
rename from tests/rust/generic-pointer.rs
rename to tests/rust/generic_pointer.rs
diff --git a/tests/rust/monomorph-1.rs b/tests/rust/monomorph_1.rs
similarity index 100%
rename from tests/rust/monomorph-1.rs
rename to tests/rust/monomorph_1.rs
diff --git a/tests/rust/monomorph-2.rs b/tests/rust/monomorph_2.rs
similarity index 100%
rename from tests/rust/monomorph-2.rs
rename to tests/rust/monomorph_2.rs
diff --git a/tests/rust/monomorph-3.rs b/tests/rust/monomorph_3.rs
similarity index 100%
rename from tests/rust/monomorph-3.rs
rename to tests/rust/monomorph_3.rs
diff --git a/tests/rust/must-use.rs b/tests/rust/must_use.rs
similarity index 100%
rename from tests/rust/must-use.rs
rename to tests/rust/must_use.rs
diff --git a/tests/rust/must-use.toml b/tests/rust/must_use.toml
similarity index 100%
rename from tests/rust/must-use.toml
rename to tests/rust/must_use.toml
diff --git a/tests/rust/rename-crate/Cargo.lock b/tests/rust/rename_crate/Cargo.lock
similarity index 68%
rename from tests/rust/rename-crate/Cargo.lock
rename to tests/rust/rename_crate/Cargo.lock
index 21cc81d..2499b6d 100644
--- a/tests/rust/rename-crate/Cargo.lock
+++ b/tests/rust/rename_crate/Cargo.lock
@@ -5,21 +5,20 @@ name = "dependency"
 version = "0.1.0"
 
 [[package]]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
 
 [[package]]
-name = "old-dep-name"
+name = "old_dep_name"
 version = "0.1.0"
 dependencies = [
- "no-extern 0.1.0",
+ "no_extern",
 ]
 
 [[package]]
-name = "rename-crate"
+name = "rename_crate"
 version = "0.1.0"
 dependencies = [
- "dependency 0.1.0",
- "old-dep-name 0.1.0",
+ "dependency",
+ "old_dep_name",
 ]
-
diff --git a/tests/rust/rename-crate/Cargo.toml b/tests/rust/rename_crate/Cargo.toml
similarity index 59%
rename from tests/rust/rename-crate/Cargo.toml
rename to tests/rust/rename_crate/Cargo.toml
index a1af1a8..5927f4d 100644
--- a/tests/rust/rename-crate/Cargo.toml
+++ b/tests/rust/rename_crate/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "rename-crate"
+name = "rename_crate"
 version = "0.1.0"
 authors = ["Ryan Hunt <rhunt@eqrion.net>"]
 
 [dependencies]
 dependency = { path = "./dependency/" }
-renamed_dep = { path = "./old-dep", package = "old-dep-name" }
+renamed_dep = { path = "./old_dep", package = "old_dep_name" }
diff --git a/tests/rust/rename-crate/cbindgen.toml b/tests/rust/rename_crate/cbindgen.toml
similarity index 100%
rename from tests/rust/rename-crate/cbindgen.toml
rename to tests/rust/rename_crate/cbindgen.toml
diff --git a/tests/rust/rename-crate/dependency/Cargo.toml b/tests/rust/rename_crate/dependency/Cargo.toml
similarity index 100%
rename from tests/rust/rename-crate/dependency/Cargo.toml
rename to tests/rust/rename_crate/dependency/Cargo.toml
diff --git a/tests/rust/rename-crate/dependency/src/lib.rs b/tests/rust/rename_crate/dependency/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/dependency/src/lib.rs
rename to tests/rust/rename_crate/dependency/src/lib.rs
diff --git a/tests/rust/rename-crate/no-extern/Cargo.lock b/tests/rust/rename_crate/no_extern/Cargo.lock
similarity index 100%
rename from tests/rust/rename-crate/no-extern/Cargo.lock
rename to tests/rust/rename_crate/no_extern/Cargo.lock
diff --git a/tests/rust/rename-crate/no-extern/Cargo.toml b/tests/rust/rename_crate/no_extern/Cargo.toml
similarity index 81%
rename from tests/rust/rename-crate/no-extern/Cargo.toml
rename to tests/rust/rename_crate/no_extern/Cargo.toml
index a33672e..d328ba8 100644
--- a/tests/rust/rename-crate/no-extern/Cargo.toml
+++ b/tests/rust/rename_crate/no_extern/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
diff --git a/tests/rust/rename-crate/no-extern/src/lib.rs b/tests/rust/rename_crate/no_extern/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/no-extern/src/lib.rs
rename to tests/rust/rename_crate/no_extern/src/lib.rs
diff --git a/tests/rust/rename-crate/old-dep/Cargo.lock b/tests/rust/rename_crate/old_dep/Cargo.lock
similarity index 100%
rename from tests/rust/rename-crate/old-dep/Cargo.lock
rename to tests/rust/rename_crate/old_dep/Cargo.lock
diff --git a/tests/rust/rename-crate/old-dep/Cargo.toml b/tests/rust/rename_crate/old_dep/Cargo.toml
similarity index 67%
rename from tests/rust/rename-crate/old-dep/Cargo.toml
rename to tests/rust/rename_crate/old_dep/Cargo.toml
index f560eb3..1414262 100644
--- a/tests/rust/rename-crate/old-dep/Cargo.toml
+++ b/tests/rust/rename_crate/old_dep/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "old-dep-name"
+name = "old_dep_name"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
 
 [target.'cfg(not(target_os = "freebsd"))'.dependencies]
-no-extern = { path = "../no-extern/" }
+no_extern = { path = "../no_extern/" }
diff --git a/tests/rust/rename-crate/old-dep/src/lib.rs b/tests/rust/rename_crate/old_dep/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/old-dep/src/lib.rs
rename to tests/rust/rename_crate/old_dep/src/lib.rs
diff --git a/tests/rust/rename-crate/src/lib.rs b/tests/rust/rename_crate/src/lib.rs
similarity index 100%
rename from tests/rust/rename-crate/src/lib.rs
rename to tests/rust/rename_crate/src/lib.rs
diff --git a/tests/rust/renaming-overrides-prefixing.rs b/tests/rust/renaming_overrides_prefixing.rs
similarity index 100%
rename from tests/rust/renaming-overrides-prefixing.rs
rename to tests/rust/renaming_overrides_prefixing.rs
diff --git a/tests/rust/renaming-overrides-prefixing.toml b/tests/rust/renaming_overrides_prefixing.toml
similarity index 100%
rename from tests/rust/renaming-overrides-prefixing.toml
rename to tests/rust/renaming_overrides_prefixing.toml
diff --git a/tests/rust/simplify-option-ptr.rs b/tests/rust/simplify_option_ptr.rs
similarity index 100%
rename from tests/rust/simplify-option-ptr.rs
rename to tests/rust/simplify_option_ptr.rs
diff --git a/tests/rust/size-types.rs b/tests/rust/size_types.rs
similarity index 100%
rename from tests/rust/size-types.rs
rename to tests/rust/size_types.rs
diff --git a/tests/rust/size-types.toml b/tests/rust/size_types.toml
similarity index 100%
rename from tests/rust/size-types.toml
rename to tests/rust/size_types.toml
diff --git a/tests/rust/style-crash.rs b/tests/rust/style_crash.rs
similarity index 100%
rename from tests/rust/style-crash.rs
rename to tests/rust/style_crash.rs
diff --git a/tests/rust/transform-op.rs b/tests/rust/transform_op.rs
similarity index 100%
rename from tests/rust/transform-op.rs
rename to tests/rust/transform_op.rs
diff --git a/tests/rust/transform-op.toml b/tests/rust/transform_op.toml
similarity index 100%
rename from tests/rust/transform-op.toml
rename to tests/rust/transform_op.toml