diff --git a/process/general_concepts/_assets/score_building_blocks_example.drawio.svg b/process/general_concepts/_assets/score_building_blocks_example.drawio.svg
index dc91625f0b..2d4083775a 100644
--- a/process/general_concepts/_assets/score_building_blocks_example.drawio.svg
+++ b/process/general_concepts/_assets/score_building_blocks_example.drawio.svg
@@ -1,4 +1,4 @@
-
+
-
\ No newline at end of file
+
diff --git a/process/general_concepts/score_building_blocks_concept.rst b/process/general_concepts/score_building_blocks_concept.rst
index aa963ef459..5696a64467 100644
--- a/process/general_concepts/score_building_blocks_concept.rst
+++ b/process/general_concepts/score_building_blocks_concept.rst
@@ -42,13 +42,16 @@ Assumptions of Use** (blue box, top, 7nd column).
The platform consists of **Features** (yellow box, middle, 2nd column).
Further the project provides **Dependable Elements** (red box, middle, 1st column),
-which can also be developed as a SEooC and it can be delivered as part of a Delivery
-Container. A Dependable Element is consists of **Components** (green box, middle, 2nd column)
-or a set of components realizing a Feature of the platform. In this sense a Dependable
-Element is the highest abstraction level in our model. A Dependable Element,
+which can also be developed as a SEooC and are delivered as part of a **Delivery
+Container**. This Delivery Container can contain one or more Dependable Elements,
+it is versioned and can be depended on by other Delivery Containers.
+A Dependable Element consists of one or more **Components** (green box, middle, 2nd column),
+which are in the same Delivery Container as the Dependable Element.
+In this sense a Dependable Element is the highest abstraction level in our model. A Dependable Element,
delivered in a Delivery Container represents e.g. executable code or a library.
The **Dependable Element View** (red box, middle, 1st column) documents the mapping of
-components to a Dependable Element.
+components to a Dependable Element. Note that the term "Dependable" hints that the
+element can have safety and/or security relevance (but also non of these).
Components are the major building blocks of the platform. Components consists of **Units**
(grey box, bottom, 2nd column), the lowest level in our model. The represent the source code,
diff --git a/process/roles/index.rst b/process/roles/index.rst
index 337c694c4b..e5a74e115d 100644
--- a/process/roles/index.rst
+++ b/process/roles/index.rst
@@ -118,8 +118,8 @@ Project Development Roles
(Eclipse) Open Source Role, person(s) who is(are) responsible for coordinating the resolution of Vulnerabilities within the Project.
By default, the project Security Team includes all Committers. However, the Project may choose a different arrangement and establish specific criteria for team nominations.
-Project Feature Teams
----------------------
+Project Teams
+-------------
.. role:: Platform Team
:id: rl__platform_team
@@ -129,14 +129,14 @@ Project Feature Teams
The platform team is responsible for all artifacts within the platform SEooC. Additionally it is also responsible for the overall process including its support by tooling.
-.. role:: Module Team
- :id: rl__module_team
+.. role:: Delivery Team
+ :id: rl__delivery_team
:status: valid
:tags: cross_functional
:contains: rl__safety_manager, rl__quality_manager, rl__security_manager, rl__contributor, rl__committer
- The module team is responsible for all artifacts within the module SEooCs. Each module has only one responsible team but a team may also be responsible for several (small) modules.
- One of the committers in the team acts as the "Module Project Manager" and is responsible for planning and reporting.
+ The delivery team is responsible for all artifacts within the Delivery Container SEooCs containing the Dependable Elements. Each Delivery Container has only one responsible team.
+ One of the committers in the team acts as the "Project Manager" and is responsible for planning and reporting.
Project Roles List
------------------