diff --git a/src/tests/stdlib/includes_empty_num_array.ab b/src/tests/stdlib/array_contains_empty_num_array.ab
similarity index 100%
rename from src/tests/stdlib/includes_empty_num_array.ab
rename to src/tests/stdlib/array_contains_empty_num_array.ab
diff --git a/src/tests/stdlib/includes_empty_text_array.ab b/src/tests/stdlib/array_contains_empty_text_array.ab
similarity index 100%
rename from src/tests/stdlib/includes_empty_text_array.ab
rename to src/tests/stdlib/array_contains_empty_text_array.ab
diff --git a/src/tests/stdlib/includes_exact_match.ab b/src/tests/stdlib/array_contains_exact_match.ab
similarity index 100%
rename from src/tests/stdlib/includes_exact_match.ab
rename to src/tests/stdlib/array_contains_exact_match.ab
diff --git a/src/tests/stdlib/includes_partial_match_with_expanded_element.ab b/src/tests/stdlib/array_contains_partial_match_with_expanded_element.ab
similarity index 100%
rename from src/tests/stdlib/includes_partial_match_with_expanded_element.ab
rename to src/tests/stdlib/array_contains_partial_match_with_expanded_element.ab
diff --git a/src/tests/stdlib/includes_prefix_match.ab b/src/tests/stdlib/array_contains_prefix_match.ab
similarity index 100%
rename from src/tests/stdlib/includes_prefix_match.ab
rename to src/tests/stdlib/array_contains_prefix_match.ab
diff --git a/src/tests/stdlib/includes_text_array.ab b/src/tests/stdlib/array_contains_text_array.ab
similarity index 100%
rename from src/tests/stdlib/includes_text_array.ab
rename to src/tests/stdlib/array_contains_text_array.ab
diff --git a/src/tests/stdlib/confirm.output.txt b/src/tests/stdlib/env_input_confirm.output.txt
similarity index 100%
rename from src/tests/stdlib/confirm.output.txt
rename to src/tests/stdlib/env_input_confirm.output.txt
diff --git a/src/tests/stdlib/glob_absolute_missing_file.ab b/src/tests/stdlib/fs_glob_absolute_missing_file.ab
similarity index 100%
rename from src/tests/stdlib/glob_absolute_missing_file.ab
rename to src/tests/stdlib/fs_glob_absolute_missing_file.ab
diff --git a/src/tests/stdlib/glob_absolute_multiple_globs.ab b/src/tests/stdlib/fs_glob_absolute_multiple_globs.ab
similarity index 100%
rename from src/tests/stdlib/glob_absolute_multiple_globs.ab
rename to src/tests/stdlib/fs_glob_absolute_multiple_globs.ab
diff --git a/src/tests/stdlib/glob_absolute_wild_char.ab b/src/tests/stdlib/fs_glob_absolute_wild_char.ab
similarity index 100%
rename from src/tests/stdlib/glob_absolute_wild_char.ab
rename to src/tests/stdlib/fs_glob_absolute_wild_char.ab
diff --git a/src/tests/stdlib/glob_absolute_wild_star.ab b/src/tests/stdlib/fs_glob_absolute_wild_star.ab
similarity index 100%
rename from src/tests/stdlib/glob_absolute_wild_star.ab
rename to src/tests/stdlib/fs_glob_absolute_wild_star.ab
diff --git a/src/tests/stdlib/glob_absolute_with_spaces.ab b/src/tests/stdlib/fs_glob_absolute_with_spaces.ab
similarity index 100%
rename from src/tests/stdlib/glob_absolute_with_spaces.ab
rename to src/tests/stdlib/fs_glob_absolute_with_spaces.ab
diff --git a/src/tests/stdlib/glob_injection_attack.ab b/src/tests/stdlib/fs_glob_injection_attack.ab
similarity index 100%
rename from src/tests/stdlib/glob_injection_attack.ab
rename to src/tests/stdlib/fs_glob_injection_attack.ab
diff --git a/src/tests/stdlib/glob_relative_missing_file.ab b/src/tests/stdlib/fs_glob_relative_missing_file.ab
similarity index 100%
rename from src/tests/stdlib/glob_relative_missing_file.ab
rename to src/tests/stdlib/fs_glob_relative_missing_file.ab
diff --git a/src/tests/stdlib/glob_relative_multiple_globs.ab b/src/tests/stdlib/fs_glob_relative_multiple_globs.ab
similarity index 100%
rename from src/tests/stdlib/glob_relative_multiple_globs.ab
rename to src/tests/stdlib/fs_glob_relative_multiple_globs.ab
diff --git a/src/tests/stdlib/glob_relative_wild_char.ab b/src/tests/stdlib/fs_glob_relative_wild_char.ab
similarity index 100%
rename from src/tests/stdlib/glob_relative_wild_char.ab
rename to src/tests/stdlib/fs_glob_relative_wild_char.ab
diff --git a/src/tests/stdlib/glob_relative_wild_star.ab b/src/tests/stdlib/fs_glob_relative_wild_star.ab
similarity index 100%
rename from src/tests/stdlib/glob_relative_wild_star.ab
rename to src/tests/stdlib/fs_glob_relative_wild_star.ab
diff --git a/src/tests/stdlib/glob_relative_with_spaces.ab b/src/tests/stdlib/fs_glob_relative_with_spaces.ab
similarity index 100%
rename from src/tests/stdlib/glob_relative_with_spaces.ab
rename to src/tests/stdlib/fs_glob_relative_with_spaces.ab
diff --git a/src/tests/stdlib/replace_regex_basic.ab b/src/tests/stdlib/text_replace_regex_basic.ab
similarity index 100%
rename from src/tests/stdlib/replace_regex_basic.ab
rename to src/tests/stdlib/text_replace_regex_basic.ab
diff --git a/src/tests/stdlib/replace_regex_ext.ab b/src/tests/stdlib/text_replace_regex_ext.ab
similarity index 100%
rename from src/tests/stdlib/replace_regex_ext.ab
rename to src/tests/stdlib/text_replace_regex_ext.ab
diff --git a/src/tests/stdlib/split_multiline.ab b/src/tests/stdlib/text_split_multiline.ab
similarity index 100%
rename from src/tests/stdlib/split_multiline.ab
rename to src/tests/stdlib/text_split_multiline.ab
diff --git a/src/tests/stdlib/trim.output.txt b/src/tests/stdlib/text_trim.output.txt
similarity index 100%
rename from src/tests/stdlib/trim.output.txt
rename to src/tests/stdlib/text_trim.output.txt
diff --git a/src/tests/stdlib/trim_left.output.txt b/src/tests/stdlib/text_trim_left.output.txt
similarity index 100%
rename from src/tests/stdlib/trim_left.output.txt
rename to src/tests/stdlib/text_trim_left.output.txt
diff --git a/src/tests/stdlib/trim_right.output.txt b/src/tests/stdlib/text_trim_right.output.txt
similarity index 100%
rename from src/tests/stdlib/trim_right.output.txt
rename to src/tests/stdlib/text_trim_right.output.txt