diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index 836e77c..cef2258 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -59,19 +59,19 @@ can then grant permission or deny it. An administrator (or owner) can also direc
CRUD Authorization
-## Metadata
+## Metadatamanager
Handles opensearch-structure (roles, rolesmappings, tenants...) and provides endpoints for indexing and handling application-indizes.
-When creating an organization, metadata-Service will provide a tenant, as well as dedicated roles and rolesmappings for organization-level roles.
+When creating an organization, metadata-service will provide a tenant, as well as dedicated roles and rolesmappings for organization-level roles.

CRUD organization
-When creating a space, metadata-Service will provide a tenant, as well as dedicated roles and rolesmappings for space-level roles and an
+When creating a space, metadata-service will provide a tenant, as well as dedicated roles and rolesmappings for space-level roles and an
index `__measurements` (including an alias `measurements`).