diff --git a/src/extensions/score_metamodel/metamodel.yaml b/src/extensions/score_metamodel/metamodel.yaml
index 9a6deb4ad..5f74e43ff 100644
--- a/src/extensions/score_metamodel/metamodel.yaml
+++ b/src/extensions/score_metamodel/metamodel.yaml
@@ -290,11 +290,11 @@ needs_types:
       # req-Id: tool_req__docs_common_attr_description
       content: ^[\s\S]+$
       valid_from: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
+    mandatory_links:
+      satisfied_by: feat
     optional_links:
       # req-Id: tool_req__docs_req_link_satisfies_allowed
       derived_from: stkh_req
-      belongs_to: feat # for evaluation
-      satisfied_by: feat # new preferred name for belongs_to
       # req-Id: tool_req__docs_req_link_covers_aou
       covers: aou_req
     optional_options:
@@ -322,12 +322,11 @@ needs_types:
       status: ^(valid|invalid)$
       # req-Id: tool_req__docs_common_attr_description
       content: ^[\s\S]+$
+    mandatory_links:
+      satisfied_by: comp
     optional_links:
       # req-Id: tool_req__docs_req_link_satisfies_allowed
       derived_from: feat_req
-      belongs_to: comp # for backward compatibility
-      satisfied_by: comp # new preferred name for belongs_to
-      # TODO: make satisfied_by mandatory once downstream repos migrate from belongs_to
       # req-Id: tool_req__docs_req_link_covers_aou
       covers: aou_req
     optional_options:
diff --git a/src/extensions/score_metamodel/tests/rst/options/test_options_failure_effect.rst b/src/extensions/score_metamodel/tests/rst/options/test_options_failure_effect.rst
index 9d0b9a1fc..6ef600c20 100644
--- a/src/extensions/score_metamodel/tests/rst/options/test_options_failure_effect.rst
+++ b/src/extensions/score_metamodel/tests/rst/options/test_options_failure_effect.rst
@@ -158,7 +158,7 @@
 .. feat_saf_fmea:: Empty failure_effect
    :id: feat_saf_fmea__test__empty_failure_effect
    :fault_id: FMEA_05
-   :failure_effect: 
+   :failure_effect:
    :sufficient: yes
    :status: valid
    :expect: feat_saf_fmea__test__empty_failure_effect: is missing required attribute: `failure_effect`.
diff --git a/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst b/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst
index 1fb3a046b..44c523787 100644
--- a/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst
+++ b/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst
@@ -54,6 +54,7 @@
 .. feat_req:: Child requirement
    :id: feat_req__abcg
    :derived_from: stkh_req__abcd
+   :satisfied_by: feat__abcg
    :expect_not: feat_req__abcg: is missing required link
 
 .. stkh_req:: Parent requirement