ELT-Platform.md

@@ -6,21 +6,21 @@ ELT Platform Lifecycle
 Streams
 -------
 
-* **ELT Platform Next** - The ELT Packages Collection is aimed at the next major release. It is a bleeding-edge development stream for ELT DevEnv and ECOS packages.
+* **ELT Platform Next Stream** - The ELT Packages Collection is aimed at the next major release. It is a bleeding-edge development stream for ELT DevEnv and ECOS packages.
   * Builds against multiple targets (Base OS).
   * No restrictions on update policy.
   * Broken packages are allowed.
   * No CI for that stream (with current infra state).
-* **Yearly Branches** - The ELT Packages Collection is aimed at the yearly public and biannual CCS releases. Yearly Branches are branched out from ELT Platform Next. Quite stable development stream for higher level ELT Control Software Projects like IFW, RTCTK, HLCC, LSVs, and TREx.
+* **Yearly Streams** - The ELT Packages Collection is aimed at the yearly public and biannual CCS releases. Yearly Streams are branched out from ELT Platform Next Stream. Quite stable development platform for higher level ELT Control Software Projects like IFW, RTCTK, HLCC, LSVs, and TREx.
   * Build and tested against one target (Base OS).
   * Relaxed update policy.
   * Broken packages should be fixed fast.
   * Stream fully supported by CI.
-* **Release Branches** - The ELT Package Collection branched out from Yearly Branch or another Release Branch. The Release Branch is used to stabilize the release and deliver eventual patches and bug fixes.
-  * The ELT DevEnv team provides infrastructure and support for two release branches yearly.
+* **Release Streams** - The ELT Package Collection branched out from Yearly Stream or another Release Stream. The Release Stream is used to stabilize the release and deliver eventual patches and bug fixes.
+  * The ELT DevEnv team provides infrastructure and support for two release streams yearly.
     * Public release, and CCS release - owned by IFW, RTCTK, HLCC, and CCS.
     * CCS release - owned by CCS.
-  * The ELT DevEnv team may provide support and infrastructure for more release branches for a cost of 0.2 FTE covered by the requesting party.
+  * The ELT DevEnv team may provide support and infrastructure for more release streams for a cost of 0.2 FTE covered by the requesting party.
   * Strict update policy. Owners of a branch have exclusive rights to decide about updates.
   * Broken packages are not allowed.
   * Stream fully supported by CI.
@@ -28,19 +28,19 @@ Streams
 Update Policy
 -------------
 
-Each platform stream has a different update policy since they target different use cases.
+Each ELT Platform Stream type has a different update policy since they target different use cases.
 
 * **ELT Platform Next** 
   * No restrictions on braking changes.
   * Ideally teams coordinate updates to avoid broken packages.
-* **Yearly Branches**
+* **Yearly Streams**
   * Projects may introduce breaking changes only till the release date scheduled in XXX.
   * Breaking changes that are unanimously agreed between all affected ELT Platform projects are allowed.
   * Updates containing bug fixes and new features are allowed and can be merged at any time.
   * All updates have to pass staging pipelines before being provided to users.
     * Each broken test has to be examined individually. I.e. flaky test or improper API usage doesn't block the update.
-* **Release Branches**
-  * Any update has to be unanimously agreed upon by owners of the release branch.
+* **Release Streams**
+  * Any update has to be unanimously agreed upon by owners of the release stream.
   * All updates have to pass staging pipelines before being provided to users.
 
 ## Versioning