subject->subject matter

developing-saf/concept/concepts.md

@@ -552,10 +552,10 @@ exposed in viewpoint [Common Standards Definition Viewpoint](../viewpoints/Commo
 realized by Stereotype [SAF_StandardizationSubject](../../stereotypes.md#SAF_StandardizationSubject)
 
 Subject of standardization of a standard, e.g. File Format or Protocol.
-## Subject
+## Subject Matter
 exposed in viewpoint [Argumentation Assurance Viewpoint](../viewpoints/Argumentation-Assurance-Viewpoint.md)
 
-realized by Stereotype [SAF_Subject](../../stereotypes.md#SAF_Subject)
+realized by Stereotype [SAF_SubjectMatter](../../stereotypes.md#SAF_SubjectMatter)
 
 Note: A claim cannot be generic, it has to be about something, it has to have a defined subject, e.g., system safety.
 ## System
@@ -749,13 +749,13 @@ Specifies the fact that any claimable item, e.g., claim, argument, and evidence,
 Specifies the fact that a Context Function is assigned to a Logical Context Element.
 Note: This fact may be derived from the Usage of Function of a Context Function allocated to a Logical Context Element.
 ## CLMbeingMadeAboutSBT
-1 [Claim](#Claim) CLMbeingMadeAboutSBT 0..1 [Subject](#Subject) 
+1 [Claim](#Claim) CLMbeingMadeAboutSBT 0..1 [Subject Matter](#Subject-Matter) 
 
 exposed in viewpoint [Argumentation Assurance Viewpoint](../viewpoints/Argumentation-Assurance-Viewpoint.md)
 
 realized by Stereotype [SAF_ClaimAboutSubjectMaking](../../stereotypes.md#SAF_ClaimAboutSubjectMaking)
 
-Specifies the fact that a claim is made about an identified subject.
+Specifies the fact that a claim is made about an identified subject matter.
 ## CLMsupportingCIM
 0..* [Claim](#Claim) CLMsupportingCIM 0..* [Claimable Item](#Claimable-Item) 
 

developing-saf/viewpoints/Argumentation-Assurance-Viewpoint.md

@@ -32,7 +32,7 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |[SAF_Evidence](../../stereotypes.md#SAF_Evidence)|[Evidence](../concept/concepts.md#Evidence)|
 |[SAF_Refuter](../../stereotypes.md#SAF_Refuter)|[Refuter](../concept/concepts.md#Refuter)|
 |[SAF_SCV02a_View](../../stereotypes.md#SAF_SCV02a_View)|[Argumentation Assurance Viewpoint](../concept/concepts.md#Argumentation-Assurance-Viewpoint)|
-|[SAF_Subject](../../stereotypes.md#SAF_Subject)|[Subject](../concept/concepts.md#Subject)|
+|[SAF_SubjectMatter](../../stereotypes.md#SAF_SubjectMatter)|[Subject Matter](../concept/concepts.md#Subject-Matter)|
 ## Input from other Viewpoints
 ### Required Viewpoints
 *none*

developing-saf/viewpoints/Physical-Context-Definition-Viewpoint.md

@@ -33,8 +33,8 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |Stereotype | realized Concept|
 |---|---|
 |[SAF_PhysicalContext](../../stereotypes.md#SAF_PhysicalContext)|[Physical System Context](../concept/concepts.md#Physical-System-Context)|
-|SAF_PhysicalContextRole contained in SAF_PhysicalContext|[Physical SOI Role](../concept/concepts.md#Physical-SOI-Role)|
 |SAF_PhysicalContextRole contained in SAF_PhysicalContext|[Physical Context Element Role](../concept/concepts.md#Physical-Context-Element-Role)|
+|SAF_PhysicalContextRole contained in SAF_PhysicalContext|[Physical SOI Role](../concept/concepts.md#Physical-SOI-Role)|
 |[SAF_PhysicalEnvironment](../../stereotypes.md#SAF_PhysicalEnvironment)|[Physical Environment](../concept/concepts.md#Physical-Environment)|
 |[SAF_PhysicalExternalSystem](../../stereotypes.md#SAF_PhysicalExternalSystem)|[Physical External System](../concept/concepts.md#Physical-External-System)|
 |[SAF_PhysicalSystem](../../stereotypes.md#SAF_PhysicalSystem)|[Physical SOI](../concept/concepts.md#Physical-SOI)|

developing-saf/viewpoints/Physical-Functional-Mapping-Viewpoint.md

@@ -31,8 +31,8 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |Stereotype | realized Concept|
 |---|---|
 |Allocate [SysML Profile]|[USAGEallocatedTo](../concept/concepts.md#USAGEallocatedTo)|
-|Attribute "function" of SAF_PhysicalItem referencing SAF_SystemFunction|[SPFNallocatedToAPE](../concept/concepts.md#SPFNallocatedToAPE)|
 |Attribute "function" of SAF_PhysicalItem referencing SAF_SystemFunction|[SFNallocatedToAPE](../concept/concepts.md#SFNallocatedToAPE)|
+|Attribute "function" of SAF_PhysicalItem referencing SAF_SystemFunction|[SPFNallocatedToAPE](../concept/concepts.md#SPFNallocatedToAPE)|
 |[SAF_FunctionAction](../../stereotypes.md#SAF_FunctionAction)|[General Functional Usage](../concept/concepts.md#General-Functional-Usage)|
 |[SAF_PhysicalElement](../../stereotypes.md#SAF_PhysicalElement)|[Physical Element](../concept/concepts.md#Physical-Element)|
 |[SAF_PhysicalHardwareElement](../../stereotypes.md#SAF_PhysicalHardwareElement)|[Hardware Element](../concept/concepts.md#Hardware-Element)|

developing-saf/viewpoints/Physical-Logical-Mapping-Viewpoint.md

@@ -36,8 +36,8 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |[SAF_LogicalElement](../../stereotypes.md#SAF_LogicalElement)|[Logical Element](../concept/concepts.md#Logical-Element)|
 |SAF_LogicalInternalRole contained in SAF_LogicalElement|[Logical Element Role](../concept/concepts.md#Logical-Element-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Hardware Element Role](../concept/concepts.md#Hardware-Element-Role)|
-|SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Element Role](../concept/concepts.md#Physical-Element-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Software Element Role](../concept/concepts.md#Software-Element-Role)|
+|SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Element Role](../concept/concepts.md#Physical-Element-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Hardware Role](../concept/concepts.md#Physical-Hardware-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Software Role](../concept/concepts.md#Physical-Software-Role)|
 |[SAF_PhysicalInternalRole](../../stereotypes.md#SAF_PhysicalInternalRole)|[General Physical Role](../concept/concepts.md#General-Physical-Role)|

developing-saf/viewpoints/Physical-Structure-Viewpoint.md

@@ -29,8 +29,8 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |[SAF_PhysicalElement](../../stereotypes.md#SAF_PhysicalElement)|[Physical Element](../concept/concepts.md#Physical-Element)|
 |[SAF_PhysicalHardwareElement](../../stereotypes.md#SAF_PhysicalHardwareElement)|[Hardware Element](../concept/concepts.md#Hardware-Element)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Hardware Element Role](../concept/concepts.md#Hardware-Element-Role)|
-|SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Element Role](../concept/concepts.md#Physical-Element-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Software Element Role](../concept/concepts.md#Software-Element-Role)|
+|SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Element Role](../concept/concepts.md#Physical-Element-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Hardware Role](../concept/concepts.md#Physical-Hardware-Role)|
 |SAF_PhysicalInternalRole contained in SAF_PhysicalItem|[Physical Software Role](../concept/concepts.md#Physical-Software-Role)|
 |[SAF_PhysicalSoftwareElement](../../stereotypes.md#SAF_PhysicalSoftwareElement)|[Software Element](../concept/concepts.md#Software-Element)|

developing-saf/viewpoints/System-Process-Viewpoint.md

@@ -57,8 +57,8 @@ The following Stereotypes / Model Elements are used in the Viewpoint:
 |[SAF_ContextAction](../../stereotypes.md#SAF_ContextAction)|[Context Function IN System Process](../concept/concepts.md#Context-Function-IN-System-Process)|
 |[SAF_ContextFunction](../../stereotypes.md#SAF_ContextFunction)|[Context Function](../concept/concepts.md#Context-Function)|
 |[SAF_FunctionAction](../../stereotypes.md#SAF_FunctionAction)|[System Function IN System Process](../concept/concepts.md#System-Function-IN-System-Process)|
-|SAF_LogicalContextRole contained in SAF_LogicalContext|[Logical Context Element Role](../concept/concepts.md#Logical-Context-Element-Role)|
 |SAF_LogicalContextRole contained in SAF_LogicalContext|[Logical SOI Role](../concept/concepts.md#Logical-SOI-Role)|
+|SAF_LogicalContextRole contained in SAF_LogicalContext|[Logical Context Element Role](../concept/concepts.md#Logical-Context-Element-Role)|
 |[SAF_SFV03a_View](../../stereotypes.md#SAF_SFV03a_View)|[System Process Viewpoint](../concept/concepts.md#System-Process-Viewpoint)|
 |[SAF_SystemFunction](../../stereotypes.md#SAF_SystemFunction)|[System Function](../concept/concepts.md#System-Function)|
 |[SAF_SystemProcess](../../stereotypes.md#SAF_SystemProcess)|[System Process](../concept/concepts.md#System-Process)|