diff --git a/README.md b/README.md
index 9033869539..7c6436122d 100644
--- a/README.md
+++ b/README.md
@@ -76,9 +76,8 @@ http://irs.dev.demo.catena-x.net/api/swagger-ui/index.html?configUrl=/api/api-do
 
 Additionally, we supply our own EDC setup to be able to do end-to-end tests in an isolated environment.
 This contains of:
- - API Proxy
  - AAS Wrapper
- - DigitalTwin Registry
+ - Digital Twin Registry
  - EDC Consumer (Control and Data Plane)
  - EDC Provider (Control and Data Plane)
  - Multiple submodel servers to provide test data
@@ -98,7 +97,6 @@ http://irs.int.demo.catena-x.net/api/swagger-ui/index.html?configUrl=/api/api-do
 
 Additionally, we supply our own EDC consumer to connect to the Catena-X integration system.
 This contains of:
-- API Proxy
 - AAS Wrapper
 - EDC Consumer (Control and Data Plane)
 
diff --git a/uml-diagramms/business-context.puml b/uml-diagramms/business-context.puml
index f7cda7a995..a2c028e228 100644
--- a/uml-diagramms/business-context.puml
+++ b/uml-diagramms/business-context.puml
@@ -5,9 +5,9 @@ skinparam shadowing false
 component [**DataConsumer**] <<BusinessEntity>> as DC {
 component [**Dismantler DB**] <<System>> as CE
 component [**IRS**] <<System>> as IRS   
-component [**AAS Wrapper / AAS Proxy**] <<Component>> as AASW
+component [**AAS Wrapper**] <<Component>> as AASW
 interface "IRS API" as IAPI
-interface "AAS Wrapper/ \nProxy API" as AASA
+interface "AAS Wrapper API" as AASA
 
 }
 
diff --git a/uml-diagramms/irs-overall-system-view.puml b/uml-diagramms/irs-overall-system-view.puml
index 1d348e28be..3b676ed9e6 100644
--- a/uml-diagramms/irs-overall-system-view.puml
+++ b/uml-diagramms/irs-overall-system-view.puml
@@ -4,7 +4,7 @@ skinparam shadowing false
 
 [**IRS**] <<System>> as IRS
 
-[**AAS Wrapper / AAS Proxy**] <<Component>> as AASW
+[**AAS Wrapper**] <<Component>> as AASW
 
 
 node "Digital Twin Registry" {
@@ -14,20 +14,20 @@ node "Digital Twin Registry" {
 node "Group of Submodel Endpoints" {
   [**Submodel-Server**] <<Component>> as SN
 }
+
 actor Consumer
 interface "IRS API" as IAPI
-interface "AASProxyAPI" as IAASW
-interface "IRegistryAPI" as IRAPI
-interface "ISubmodelAPI" as ISubModelAPI
+interface "AASWrapper API" as IAASW
+interface "Registry API" as IRAPI
+interface "Submodel API" as ISubModelAPI
 
 Consumer -( IAPI
 IAPI - IRS
 IAASW - AASW
 IRS -( IAASW
-IRAPI - AASR
-AASW --( IRAPI
 ISubModelAPI - SN
 AASW -( ISubModelAPI
-
+IRS --( IRAPI
+IRAPI -- AASR
 
 @enduml
\ No newline at end of file