ccsapp · ytausch · Jul 4, 2023 · Mar 30, 2023 · Mar 30, 2023 · Mar 30, 2023
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
-# ConnectedCarServicesApplicationVersion2.0 (CCSAppV2.0) Documentation
+# ConnectedCarServicesApplication (CCSApp) Documentation
+
+This repository contains the CCSApp project documentation.
+
+For a more general overview, take a look [here](https://github.com/ccsapp).
 
 ## ANALYSIS
 

diff --git a/pages/ui_architecture.md b/pages/ui_architecture.md
@@ -54,7 +54,7 @@ The fleet-data service communicates with the microservice FleetManagement. It ca
 
 ### Rental Data Service
 
-The rental-data service communicates with the microservice RentalManagement. To view all implemented methods see the API Diagramm or the [OpenAPISpec](https://git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/application/rentalmanagementdesign/-/blob/main/openapi.yaml).
+The rental-data service communicates with the microservice RentalManagement. To view all implemented methods see the API Diagramm or the [OpenAPISpec](https://github.com/ccsapp/RentalManagementDesign/blob/main/openapi.yaml).
 
 ## Backend Connection
 

diff --git a/pages/used_terms.md b/pages/used_terms.md
@@ -1,9 +1,23 @@
 # Used Terms
 
-## Used Terms of the Ubiquitous Language of the Domain ConnectedCar 
+## Car-related Terms
+
+The ubiquitous language defined in this documentation is the language foundation of the terms that are consistently used in the doamin ConnectedCar and in the applications residing to this domain. New applications can add additional terms to this foundation if the terms are application-agnostic and, threfore, needed by other applications that are based on the domain ConnectedCar.
+
+| Term                | Definition                                                                                                                                     | Remarks                                                                                                                                         |
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| Brand               | Data that specifies the brand name of the Vehicle manufacturer                                                      |  
+| Car                 | A specific type of vehicle                                                                                      | 
+| Consumption         | Data that specifies the consumed fuel of the engine, expressed in units such as liters or kWh per kilometer     |
+| Emissions           | Data that specifies the CO2 emitted by a Vehicle during operation in gram per kilometer                             | 
+| Fleet               | A set of vehicles                                                                                               |
+| Fuel                | Data that defines the source of energy that powers the Vehicle such as petrol or electric energy                                               | 
+| Production Date             | Data that specifies the date on which the vehicle was fully assembled                                                             |  
+| Technical Specification | Data of a Vehicle encapsulating the core physical makeup and performance of the vehicle                         | 
+| Trunk               | A covered space of a Vehicle which is the main storage or cargo compartment | 
+| Vehicle             | A physical unit which is used to transport persons and/or goods. Examples of vehicles are: bicycle, bus, car, train, truck            |    
+| VIN | Data which uniquely identifies a Vehicle
 
-The following terms are part of the [Ubiquitous Language of the Domain ConnectedCar](https://git.scc.kit.edu/cm-tm/cm-team/connectedcar/domain/0.docconnectedcar/-/blob/master/pages/ubiquitous_language.md):
-- Brand, Car, Fleet, Model, Production Date, VIN.
 
 ## Application-related Terms
 
@@ -16,6 +30,3 @@ The following terms are part of the [Ubiquitous Language of the Domain Connected
 | Trunk Access       | A permission to open the trunk of a car which is explicitly granted to an external person        |         |
 | Trunk Access Token | A 24-char alphanumeric proof of the trunk access                                                 |         |
 | Trunk Permission   | A trunk access (explicitly granted) or the implicit permission of customer with active rental    |         |
-
-## Used Terms of the External System
-TODO
diff --git a/umlet/systemplussoftware_architecture.uxf b/umlet/systemplussoftware_architecture.uxf