diff --git a/docs/Roadmap.md b/docs/Roadmap.md
index de9dfa719..b640c31a9 100644
--- a/docs/Roadmap.md
+++ b/docs/Roadmap.md
@@ -6,12 +6,12 @@ Here, a list of features, components and general updates that are planned in the
 - AAS Client SDK (continuous)
 - AASX File Server with MongoDB and InMemory Persistency (Q2/2024)
 - Dynamic integration of features/backends in AAS Infrastructure OTS components (Q2/2024)
-- Code Generation based on AASX files (Client, ...) (Q2/2024)
+- Code Generation based on AASX files (Client, ...) (Q3/2024)
 
 ## BaSyx AAS Integration Components
 ### DataBridge 
 For more details, see [basyx-databridge](https://github.com/eclipse-basyx/basyx-databridge)
 - Bi-directional Data Exchange, e.g., with OPC UA (Q2/2024)
-- Support for Asset Interface Description Submodel and Asset Interface Mapping Description Submodel (Q2/2024)
+- Support for Asset Interface Description Submodel and Asset Interface Mapping Configuration Submodel (Q2/2024)
 - GUI-based Configuration (Q2/2024)
 - Integration of more complex data transformation, e.g., data aggregation of historic data (Q2/2024)