diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
rename to test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
rename to test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol
rename to test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol
rename to test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
rename to test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol b/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
rename to test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_bound_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
similarity index 100%
rename from test/libsolidity/smtCheckerTests/functions/functions_bound_1.sol
rename to test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
similarity index 100%
rename from test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol
rename to test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
rename to test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/assign_bound.sol
rename to test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
rename to test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol
rename to test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol
rename to test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol
rename to test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_calldata_struct.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_to_calldata_struct.sol
rename to test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_calldata.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_calldata.sol
rename to test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
diff --git a/test/libsolidity/syntaxTests/bound/interface_using_for.sol b/test/libsolidity/syntaxTests/using/interface_using_for.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/interface_using_for.sol
rename to test/libsolidity/syntaxTests/using/interface_using_for.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_call.sol b/test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_call.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_no_call.sol b/test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_no_call.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_all.sol b/test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_all.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
diff --git a/test/libsolidity/syntaxTests/bound/using_for_library.sol b/test/libsolidity/syntaxTests/using/using_library_for_library.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/using_for_library.sol
rename to test/libsolidity/syntaxTests/using/using_library_for_library.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol b/test/libsolidity/syntaxTests/using/using_struct_for_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_to_struct.sol
rename to test/libsolidity/syntaxTests/using/using_struct_for_struct.sol