diff --git a/cue/testdata/basicrewrite/003_integer-specific arithmetic.txtar b/cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/003_integer-specific arithmetic.txtar
rename to cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar
diff --git a/cue/testdata/basicrewrite/005_boolean arithmetic.txtar b/cue/testdata/basicrewrite/005_boolean_arithmetic.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/005_boolean arithmetic.txtar
rename to cue/testdata/basicrewrite/005_boolean_arithmetic.txtar
diff --git a/cue/testdata/basicrewrite/006_basic type.txtar b/cue/testdata/basicrewrite/006_basic_type.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/006_basic type.txtar
rename to cue/testdata/basicrewrite/006_basic_type.txtar
diff --git a/cue/testdata/basicrewrite/007_strings and bytes.txtar b/cue/testdata/basicrewrite/007_strings_and_bytes.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/007_strings and bytes.txtar
rename to cue/testdata/basicrewrite/007_strings_and_bytes.txtar
diff --git a/cue/testdata/basicrewrite/011_list arithmetic.txtar b/cue/testdata/basicrewrite/011_list_arithmetic.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/011_list arithmetic.txtar
rename to cue/testdata/basicrewrite/011_list_arithmetic.txtar
diff --git a/cue/testdata/basicrewrite/013_obj unify.txtar b/cue/testdata/basicrewrite/013_obj_unify.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/013_obj unify.txtar
rename to cue/testdata/basicrewrite/013_obj_unify.txtar
diff --git a/cue/testdata/basicrewrite/018_self-reference cycles.txtar b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/018_self-reference cycles.txtar
rename to cue/testdata/basicrewrite/018_self-reference_cycles.txtar
diff --git a/cue/testdata/basicrewrite/019_resolved self-reference cycles.txtar b/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/019_resolved self-reference cycles.txtar
rename to cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
diff --git a/cue/testdata/basicrewrite/020_resolved self-reference cycles: Issue 19.txtar b/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/020_resolved self-reference cycles: Issue 19.txtar
rename to cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
diff --git a/cue/testdata/basicrewrite/021_delayed constraint failure.txtar b/cue/testdata/basicrewrite/021_delayed_constraint_failure.txtar
similarity index 100%
rename from cue/testdata/basicrewrite/021_delayed constraint failure.txtar
rename to cue/testdata/basicrewrite/021_delayed_constraint_failure.txtar
diff --git a/cue/testdata/choosedefault/000_pick first.txtar b/cue/testdata/choosedefault/000_pick_first.txtar
similarity index 100%
rename from cue/testdata/choosedefault/000_pick first.txtar
rename to cue/testdata/choosedefault/000_pick_first.txtar
diff --git a/cue/testdata/choosedefault/001_simple disambiguation conflict.txtar b/cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar
similarity index 100%
rename from cue/testdata/choosedefault/001_simple disambiguation conflict.txtar
rename to cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar
diff --git a/cue/testdata/choosedefault/002_associativity of defaults.txtar b/cue/testdata/choosedefault/002_associativity_of_defaults.txtar
similarity index 100%
rename from cue/testdata/choosedefault/002_associativity of defaults.txtar
rename to cue/testdata/choosedefault/002_associativity_of_defaults.txtar
diff --git a/cue/testdata/fulleval/000_detect conflicting value.txtar b/cue/testdata/fulleval/000_detect_conflicting_value.txtar
similarity index 100%
rename from cue/testdata/fulleval/000_detect conflicting value.txtar
rename to cue/testdata/fulleval/000_detect_conflicting_value.txtar
diff --git a/cue/testdata/fulleval/001_conflicts in optional fields are okay .txtar b/cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar
similarity index 100%
rename from cue/testdata/fulleval/001_conflicts in optional fields are okay .txtar
rename to cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar
diff --git a/cue/testdata/fulleval/002_resolve all disjunctions.txtar b/cue/testdata/fulleval/002_resolve_all_disjunctions.txtar
similarity index 100%
rename from cue/testdata/fulleval/002_resolve all disjunctions.txtar
rename to cue/testdata/fulleval/002_resolve_all_disjunctions.txtar
diff --git a/cue/testdata/fulleval/003_field templates.txtar b/cue/testdata/fulleval/003_field_templates.txtar
similarity index 100%
rename from cue/testdata/fulleval/003_field templates.txtar
rename to cue/testdata/fulleval/003_field_templates.txtar
diff --git a/cue/testdata/fulleval/004_field comprehension.txtar b/cue/testdata/fulleval/004_field_comprehension.txtar
similarity index 100%
rename from cue/testdata/fulleval/004_field comprehension.txtar
rename to cue/testdata/fulleval/004_field_comprehension.txtar
diff --git a/cue/testdata/fulleval/005_conditional field.txtar b/cue/testdata/fulleval/005_conditional_field.txtar
similarity index 100%
rename from cue/testdata/fulleval/005_conditional field.txtar
rename to cue/testdata/fulleval/005_conditional_field.txtar
diff --git a/cue/testdata/fulleval/006_referencing field in field comprehension.txtar b/cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar
similarity index 100%
rename from cue/testdata/fulleval/006_referencing field in field comprehension.txtar
rename to cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar
diff --git a/cue/testdata/fulleval/007_different labels for templates.txtar b/cue/testdata/fulleval/007_different_labels_for_templates.txtar
similarity index 100%
rename from cue/testdata/fulleval/007_different labels for templates.txtar
rename to cue/testdata/fulleval/007_different_labels_for_templates.txtar
diff --git a/cue/testdata/fulleval/008_nested templates in one field.txtar b/cue/testdata/fulleval/008_nested_templates_in_one_field.txtar
similarity index 100%
rename from cue/testdata/fulleval/008_nested templates in one field.txtar
rename to cue/testdata/fulleval/008_nested_templates_in_one_field.txtar
diff --git a/cue/testdata/fulleval/009_template unification within one struct.txtar b/cue/testdata/fulleval/009_template_unification_within_one_struct.txtar
similarity index 100%
rename from cue/testdata/fulleval/009_template unification within one struct.txtar
rename to cue/testdata/fulleval/009_template_unification_within_one_struct.txtar
diff --git a/cue/testdata/fulleval/010_field comprehensions with multiple keys.txtar b/cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar
similarity index 100%
rename from cue/testdata/fulleval/010_field comprehensions with multiple keys.txtar
rename to cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar
diff --git a/cue/testdata/fulleval/011_field comprehensions with templates.txtar b/cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar
similarity index 100%
rename from cue/testdata/fulleval/011_field comprehensions with templates.txtar
rename to cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar
diff --git a/cue/testdata/fulleval/012_disjunctions of lists.txtar b/cue/testdata/fulleval/012_disjunctions_of_lists.txtar
similarity index 100%
rename from cue/testdata/fulleval/012_disjunctions of lists.txtar
rename to cue/testdata/fulleval/012_disjunctions_of_lists.txtar
diff --git a/cue/testdata/fulleval/014_default disambiguation and elimination.txtar b/cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar
similarity index 100%
rename from cue/testdata/fulleval/014_default disambiguation and elimination.txtar
rename to cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar
diff --git a/cue/testdata/fulleval/015_list comprehension.txtar b/cue/testdata/fulleval/015_list_comprehension.txtar
similarity index 100%
rename from cue/testdata/fulleval/015_list comprehension.txtar
rename to cue/testdata/fulleval/015_list_comprehension.txtar
diff --git a/cue/testdata/fulleval/016_struct comprehension with template.txtar b/cue/testdata/fulleval/016_struct_comprehension_with_template.txtar
similarity index 100%
rename from cue/testdata/fulleval/016_struct comprehension with template.txtar
rename to cue/testdata/fulleval/016_struct_comprehension_with_template.txtar
diff --git a/cue/testdata/fulleval/017_resolutions in struct comprehension keys.txtar b/cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar
similarity index 100%
rename from cue/testdata/fulleval/017_resolutions in struct comprehension keys.txtar
rename to cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar
diff --git a/cue/testdata/fulleval/018_recursive evaluation within list.txtar b/cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar
similarity index 100%
rename from cue/testdata/fulleval/018_recursive evaluation within list.txtar
rename to cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar
diff --git a/cue/testdata/fulleval/020_complex interaction of groundness.txtar b/cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar
similarity index 100%
rename from cue/testdata/fulleval/020_complex interaction of groundness.txtar
rename to cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar
diff --git a/cue/testdata/fulleval/021_complex groundness 2.txtar b/cue/testdata/fulleval/021_complex_groundness_2.txtar
similarity index 100%
rename from cue/testdata/fulleval/021_complex groundness 2.txtar
rename to cue/testdata/fulleval/021_complex_groundness_2.txtar
diff --git a/cue/testdata/fulleval/022_references from template to concrete.txtar b/cue/testdata/fulleval/022_references_from_template_to_concrete.txtar
similarity index 100%
rename from cue/testdata/fulleval/022_references from template to concrete.txtar
rename to cue/testdata/fulleval/022_references_from_template_to_concrete.txtar
diff --git "a/cue/testdata/fulleval/024_Issue \04323.txtar" "b/cue/testdata/fulleval/024_Issue_\04323.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/024_Issue \04323.txtar"
rename to "cue/testdata/fulleval/024_Issue_\04323.txtar"
diff --git a/cue/testdata/fulleval/025_cannot resolve references that would be ambiguous.txtar b/cue/testdata/fulleval/025_cannot_resolve_references_that_would_be_ambiguous.txtar
similarity index 100%
rename from cue/testdata/fulleval/025_cannot resolve references that would be ambiguous.txtar
rename to cue/testdata/fulleval/025_cannot_resolve_references_that_would_be_ambiguous.txtar
diff --git "a/cue/testdata/fulleval/026_don\047t convert incomplete errors to non-incomplete.txtar" "b/cue/testdata/fulleval/026_don\047t_convert_incomplete_errors_to_non-incomplete.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/026_don\047t convert incomplete errors to non-incomplete.txtar"
rename to "cue/testdata/fulleval/026_don\047t_convert_incomplete_errors_to_non-incomplete.txtar"
diff --git a/cue/testdata/fulleval/027_len of incomplete types.txtar b/cue/testdata/fulleval/027_len_of_incomplete_types.txtar
similarity index 100%
rename from cue/testdata/fulleval/027_len of incomplete types.txtar
rename to cue/testdata/fulleval/027_len_of_incomplete_types.txtar
diff --git a/cue/testdata/fulleval/028_slice rewrite bug.txtar b/cue/testdata/fulleval/028_slice_rewrite_bug.txtar
similarity index 100%
rename from cue/testdata/fulleval/028_slice rewrite bug.txtar
rename to cue/testdata/fulleval/028_slice_rewrite_bug.txtar
diff --git "a/cue/testdata/fulleval/029_Issue \04394.txtar" "b/cue/testdata/fulleval/029_Issue_\04394.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/029_Issue \04394.txtar"
rename to "cue/testdata/fulleval/029_Issue_\04394.txtar"
diff --git a/cue/testdata/fulleval/030_retain references with interleaved embedding.txtar b/cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar
similarity index 100%
rename from cue/testdata/fulleval/030_retain references with interleaved embedding.txtar
rename to cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar
diff --git a/cue/testdata/fulleval/031_comparison against bottom.txtar b/cue/testdata/fulleval/031_comparison_against_bottom.txtar
similarity index 100%
rename from cue/testdata/fulleval/031_comparison against bottom.txtar
rename to cue/testdata/fulleval/031_comparison_against_bottom.txtar
diff --git a/cue/testdata/fulleval/032_or builtin should not fail on non-concrete empty list.txtar b/cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar
similarity index 100%
rename from cue/testdata/fulleval/032_or builtin should not fail on non-concrete empty list.txtar
rename to cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar
diff --git "a/cue/testdata/fulleval/033_Issue \043153.txtar" "b/cue/testdata/fulleval/033_Issue_\043153.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/033_Issue \043153.txtar"
rename to "cue/testdata/fulleval/033_Issue_\043153.txtar"
diff --git a/cue/testdata/fulleval/034_label and field aliases.txtar b/cue/testdata/fulleval/034_label_and_field_aliases.txtar
similarity index 100%
rename from cue/testdata/fulleval/034_label and field aliases.txtar
rename to cue/testdata/fulleval/034_label_and_field_aliases.txtar
diff --git a/cue/testdata/fulleval/035_optionals with label fiters.txtar b/cue/testdata/fulleval/035_optionals_with_label_fiters.txtar
similarity index 100%
rename from cue/testdata/fulleval/035_optionals with label fiters.txtar
rename to cue/testdata/fulleval/035_optionals_with_label_fiters.txtar
diff --git a/cue/testdata/fulleval/036_optionals in open structs.txtar b/cue/testdata/fulleval/036_optionals_in_open_structs.txtar
similarity index 100%
rename from cue/testdata/fulleval/036_optionals in open structs.txtar
rename to cue/testdata/fulleval/036_optionals_in_open_structs.txtar
diff --git a/cue/testdata/fulleval/037_conjunction of optional sets.txtar b/cue/testdata/fulleval/037_conjunction_of_optional_sets.txtar
similarity index 100%
rename from cue/testdata/fulleval/037_conjunction of optional sets.txtar
rename to cue/testdata/fulleval/037_conjunction_of_optional_sets.txtar
diff --git a/cue/testdata/fulleval/038_continue recursive closing for optionals.txtar b/cue/testdata/fulleval/038_continue_recursive_closing_for_optionals.txtar
similarity index 100%
rename from cue/testdata/fulleval/038_continue recursive closing for optionals.txtar
rename to cue/testdata/fulleval/038_continue_recursive_closing_for_optionals.txtar
diff --git a/cue/testdata/fulleval/039_augment closed optionals.txtar b/cue/testdata/fulleval/039_augment_closed_optionals.txtar
similarity index 100%
rename from cue/testdata/fulleval/039_augment closed optionals.txtar
rename to cue/testdata/fulleval/039_augment_closed_optionals.txtar
diff --git a/cue/testdata/fulleval/042_cross-dependent comprehension.txtar b/cue/testdata/fulleval/042_cross-dependent_comprehension.txtar
similarity index 100%
rename from cue/testdata/fulleval/042_cross-dependent comprehension.txtar
rename to cue/testdata/fulleval/042_cross-dependent_comprehension.txtar
diff --git a/cue/testdata/fulleval/043_optional expanded before lookup.txtar b/cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar
similarity index 100%
rename from cue/testdata/fulleval/043_optional expanded before lookup.txtar
rename to cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar
diff --git "a/cue/testdata/fulleval/044_Issue \043178.txtar" "b/cue/testdata/fulleval/044_Issue_\043178.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/044_Issue \043178.txtar"
rename to "cue/testdata/fulleval/044_Issue_\043178.txtar"
diff --git a/cue/testdata/fulleval/045_comprehension and skipped field.txtar b/cue/testdata/fulleval/045_comprehension_and_skipped_field.txtar
similarity index 100%
rename from cue/testdata/fulleval/045_comprehension and skipped field.txtar
rename to cue/testdata/fulleval/045_comprehension_and_skipped_field.txtar
diff --git a/cue/testdata/fulleval/046_non-structural direct cycles.txtar b/cue/testdata/fulleval/046_non-structural_direct_cycles.txtar
similarity index 100%
rename from cue/testdata/fulleval/046_non-structural direct cycles.txtar
rename to cue/testdata/fulleval/046_non-structural_direct_cycles.txtar
diff --git "a/cue/testdata/fulleval/047_don\047t bind to string labels.txtar" "b/cue/testdata/fulleval/047_don\047t_bind_to_string_labels.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/047_don\047t bind to string labels.txtar"
rename to "cue/testdata/fulleval/047_don\047t_bind_to_string_labels.txtar"
diff --git "a/cue/testdata/fulleval/048_don\047t pass incomplete values to builtins.txtar" "b/cue/testdata/fulleval/048_don\047t_pass_incomplete_values_to_builtins.txtar"
similarity index 100%
rename from "cue/testdata/fulleval/048_don\047t pass incomplete values to builtins.txtar"
rename to "cue/testdata/fulleval/048_don\047t_pass_incomplete_values_to_builtins.txtar"
diff --git a/cue/testdata/fulleval/049_alias reuse in nested scope.txtar b/cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar
similarity index 100%
rename from cue/testdata/fulleval/049_alias reuse in nested scope.txtar
rename to cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar
diff --git a/cue/testdata/fulleval/050_json Marshaling detects incomplete.txtar b/cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar
similarity index 100%
rename from cue/testdata/fulleval/050_json Marshaling detects incomplete.txtar
rename to cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar
diff --git a/cue/testdata/gen.go b/cue/testdata/gen.go
index 906b1aa..f0269ea 100644
--- a/cue/testdata/gen.go
+++ b/cue/testdata/gen.go
@@ -251,7 +251,8 @@
 	if e.name != "" {
 		name += "_" + e.name
 	}
-	// name = strings.ReplaceAll(name, " ", "_")
+	name = strings.ReplaceAll(name, " ", "_")
+	name = strings.ReplaceAll(name, ":", "_")
 	filename := filepath.Join(e.dir, name+".txtar")
 	err := ioutil.WriteFile(filename, txtar.Format(e.a), 0644)
 	if err != nil {
diff --git a/cue/testdata/resolve/000_convert _ to top.txtar b/cue/testdata/resolve/000_convert___to_top.txtar
similarity index 100%
rename from cue/testdata/resolve/000_convert _ to top.txtar
rename to cue/testdata/resolve/000_convert___to_top.txtar
diff --git a/cue/testdata/resolve/003_resolution of quoted identifiers.txtar b/cue/testdata/resolve/003_resolution_of_quoted_identifiers.txtar
similarity index 100%
rename from cue/testdata/resolve/003_resolution of quoted identifiers.txtar
rename to cue/testdata/resolve/003_resolution_of_quoted_identifiers.txtar
diff --git a/cue/testdata/resolve/009_optional field unification.txtar b/cue/testdata/resolve/009_optional_field_unification.txtar
similarity index 100%
rename from cue/testdata/resolve/009_optional field unification.txtar
rename to cue/testdata/resolve/009_optional_field_unification.txtar
diff --git a/cue/testdata/resolve/010_optional field resolves to incomplete.txtar b/cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar
similarity index 100%
rename from cue/testdata/resolve/010_optional field resolves to incomplete.txtar
rename to cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar
diff --git a/cue/testdata/resolve/012_bound conversions.txtar b/cue/testdata/resolve/012_bound_conversions.txtar
similarity index 100%
rename from cue/testdata/resolve/012_bound conversions.txtar
rename to cue/testdata/resolve/012_bound_conversions.txtar
diff --git a/cue/testdata/resolve/013_custom validators.txtar b/cue/testdata/resolve/013_custom_validators.txtar
similarity index 100%
rename from cue/testdata/resolve/013_custom validators.txtar
rename to cue/testdata/resolve/013_custom_validators.txtar
diff --git a/cue/testdata/resolve/014_null coalescing.txtar b/cue/testdata/resolve/014_null_coalescing.txtar
similarity index 100%
rename from cue/testdata/resolve/014_null coalescing.txtar
rename to cue/testdata/resolve/014_null_coalescing.txtar
diff --git a/cue/testdata/resolve/015_reference across tuples and back.txtar b/cue/testdata/resolve/015_reference_across_tuples_and_back.txtar
similarity index 100%
rename from cue/testdata/resolve/015_reference across tuples and back.txtar
rename to cue/testdata/resolve/015_reference_across_tuples_and_back.txtar
diff --git a/cue/testdata/resolve/017_disjunctions of lists.txtar b/cue/testdata/resolve/017_disjunctions_of_lists.txtar
similarity index 100%
rename from cue/testdata/resolve/017_disjunctions of lists.txtar
rename to cue/testdata/resolve/017_disjunctions_of_lists.txtar
diff --git a/cue/testdata/resolve/019_list types.txtar b/cue/testdata/resolve/019_list_types.txtar
similarity index 100%
rename from cue/testdata/resolve/019_list types.txtar
rename to cue/testdata/resolve/019_list_types.txtar
diff --git a/cue/testdata/resolve/020_list arithmetic.txtar b/cue/testdata/resolve/020_list_arithmetic.txtar
similarity index 100%
rename from cue/testdata/resolve/020_list arithmetic.txtar
rename to cue/testdata/resolve/020_list_arithmetic.txtar
diff --git a/cue/testdata/resolve/021_list equality.txtar b/cue/testdata/resolve/021_list_equality.txtar
similarity index 100%
rename from cue/testdata/resolve/021_list equality.txtar
rename to cue/testdata/resolve/021_list_equality.txtar
diff --git a/cue/testdata/resolve/022_list unification.txtar b/cue/testdata/resolve/022_list_unification.txtar
similarity index 100%
rename from cue/testdata/resolve/022_list unification.txtar
rename to cue/testdata/resolve/022_list_unification.txtar
diff --git a/cue/testdata/resolve/023_correct error messages.txtar b/cue/testdata/resolve/023_correct_error_messages.txtar
similarity index 100%
rename from cue/testdata/resolve/023_correct error messages.txtar
rename to cue/testdata/resolve/023_correct_error_messages.txtar
diff --git a/cue/testdata/resolve/026_combined definitions.txtar b/cue/testdata/resolve/026_combined_definitions.txtar
similarity index 100%
rename from cue/testdata/resolve/026_combined definitions.txtar
rename to cue/testdata/resolve/026_combined_definitions.txtar
diff --git a/cue/testdata/resolve/027_new-style definitions.txtar b/cue/testdata/resolve/027_new-style_definitions.txtar
similarity index 100%
rename from cue/testdata/resolve/027_new-style definitions.txtar
rename to cue/testdata/resolve/027_new-style_definitions.txtar
diff --git a/cue/testdata/resolve/028_recursive closing starting at non-definition.txtar b/cue/testdata/resolve/028_recursive_closing_starting_at_non-definition.txtar
similarity index 100%
rename from cue/testdata/resolve/028_recursive closing starting at non-definition.txtar
rename to cue/testdata/resolve/028_recursive_closing_starting_at_non-definition.txtar
diff --git a/cue/testdata/resolve/029_non-closed definition carries over closedness to enclosed template.txtar b/cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar
similarity index 100%
rename from cue/testdata/resolve/029_non-closed definition carries over closedness to enclosed template.txtar
rename to cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar
diff --git a/cue/testdata/resolve/030_definitions with disjunctions.txtar b/cue/testdata/resolve/030_definitions_with_disjunctions.txtar
similarity index 100%
rename from cue/testdata/resolve/030_definitions with disjunctions.txtar
rename to cue/testdata/resolve/030_definitions_with_disjunctions.txtar
diff --git a/cue/testdata/resolve/031_definitions with disjunctions recurisive.txtar b/cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar
similarity index 100%
rename from cue/testdata/resolve/031_definitions with disjunctions recurisive.txtar
rename to cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar
diff --git a/cue/testdata/resolve/032_definitions with embedding.txtar b/cue/testdata/resolve/032_definitions_with_embedding.txtar
similarity index 100%
rename from cue/testdata/resolve/032_definitions with embedding.txtar
rename to cue/testdata/resolve/032_definitions_with_embedding.txtar
diff --git a/cue/testdata/resolve/033_top-level definition with struct and disjunction.txtar b/cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar
similarity index 100%
rename from cue/testdata/resolve/033_top-level definition with struct and disjunction.txtar
rename to cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar
diff --git a/cue/testdata/resolve/034_closing structs.txtar b/cue/testdata/resolve/034_closing_structs.txtar
similarity index 100%
rename from cue/testdata/resolve/034_closing structs.txtar
rename to cue/testdata/resolve/034_closing_structs.txtar
diff --git a/cue/testdata/resolve/035_excluded embedding from closing.txtar b/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar
similarity index 100%
rename from cue/testdata/resolve/035_excluded embedding from closing.txtar
rename to cue/testdata/resolve/035_excluded_embedding_from_closing.txtar
diff --git a/cue/testdata/resolve/036_closing with failed optional.txtar b/cue/testdata/resolve/036_closing_with_failed_optional.txtar
similarity index 100%
rename from cue/testdata/resolve/036_closing with failed optional.txtar
rename to cue/testdata/resolve/036_closing_with_failed_optional.txtar
diff --git a/cue/testdata/resolve/037_closing with comprehensions.txtar b/cue/testdata/resolve/037_closing_with_comprehensions.txtar
similarity index 100%
rename from cue/testdata/resolve/037_closing with comprehensions.txtar
rename to cue/testdata/resolve/037_closing_with_comprehensions.txtar
diff --git a/cue/testdata/resolve/038_incomplete comprehensions.txtar b/cue/testdata/resolve/038_incomplete_comprehensions.txtar
similarity index 100%
rename from cue/testdata/resolve/038_incomplete comprehensions.txtar
rename to cue/testdata/resolve/038_incomplete_comprehensions.txtar
diff --git a/cue/testdata/resolve/039_reference to root.txtar b/cue/testdata/resolve/039_reference_to_root.txtar
similarity index 100%
rename from cue/testdata/resolve/039_reference to root.txtar
rename to cue/testdata/resolve/039_reference_to_root.txtar
diff --git a/cue/testdata/resolve/040_references from template to concrete.txtar b/cue/testdata/resolve/040_references_from_template_to_concrete.txtar
similarity index 100%
rename from cue/testdata/resolve/040_references from template to concrete.txtar
rename to cue/testdata/resolve/040_references_from_template_to_concrete.txtar
diff --git a/cue/testdata/resolve/042_multiline interpolation.txtar b/cue/testdata/resolve/042_multiline_interpolation.txtar
similarity index 100%
rename from cue/testdata/resolve/042_multiline interpolation.txtar
rename to cue/testdata/resolve/042_multiline_interpolation.txtar
diff --git a/cue/testdata/resolve/043_diamond-shaped constraints.txtar b/cue/testdata/resolve/043_diamond-shaped_constraints.txtar
similarity index 100%
rename from cue/testdata/resolve/043_diamond-shaped constraints.txtar
rename to cue/testdata/resolve/043_diamond-shaped_constraints.txtar
diff --git a/cue/testdata/resolve/044_field templates.txtar b/cue/testdata/resolve/044_field_templates.txtar
similarity index 100%
rename from cue/testdata/resolve/044_field templates.txtar
rename to cue/testdata/resolve/044_field_templates.txtar
diff --git a/cue/testdata/resolve/045_range unification.txtar b/cue/testdata/resolve/045_range_unification.txtar
similarity index 100%
rename from cue/testdata/resolve/045_range unification.txtar
rename to cue/testdata/resolve/045_range_unification.txtar
diff --git a/cue/testdata/resolve/046_predefined ranges.txtar b/cue/testdata/resolve/046_predefined_ranges.txtar
similarity index 100%
rename from cue/testdata/resolve/046_predefined ranges.txtar
rename to cue/testdata/resolve/046_predefined_ranges.txtar
diff --git a/cue/testdata/resolve/047_struct comprehensions.txtar b/cue/testdata/resolve/047_struct_comprehensions.txtar
similarity index 100%
rename from cue/testdata/resolve/047_struct comprehensions.txtar
rename to cue/testdata/resolve/047_struct_comprehensions.txtar
diff --git a/cue/testdata/resolve/049_self-reference cycles conflicts with strings.txtar b/cue/testdata/resolve/049_self-reference_cycles_conflicts_with_strings.txtar
similarity index 100%
rename from cue/testdata/resolve/049_self-reference cycles conflicts with strings.txtar
rename to cue/testdata/resolve/049_self-reference_cycles_conflicts_with_strings.txtar
diff --git a/cue/testdata/resolve/050_resolved self-reference cycles with disjunctions.txtar b/cue/testdata/resolve/050_resolved_self-reference_cycles_with_disjunctions.txtar
similarity index 100%
rename from cue/testdata/resolve/050_resolved self-reference cycles with disjunctions.txtar
rename to cue/testdata/resolve/050_resolved_self-reference_cycles_with_disjunctions.txtar
diff --git a/cue/testdata/resolve/051_resolved self-reference cycles with disjunction.txtar b/cue/testdata/resolve/051_resolved_self-reference_cycles_with_disjunction.txtar
similarity index 100%
rename from cue/testdata/resolve/051_resolved self-reference cycles with disjunction.txtar
rename to cue/testdata/resolve/051_resolved_self-reference_cycles_with_disjunction.txtar
diff --git a/cue/testdata/resolve/052_resolved self-reference cycles with disjunction with defaults.txtar b/cue/testdata/resolve/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar
similarity index 100%
rename from cue/testdata/resolve/052_resolved self-reference cycles with disjunction with defaults.txtar
rename to cue/testdata/resolve/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar