diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 4ecd2941d74717e3ef1791e8a0c1e4e039da9b66..81bc4dff284d5e739981af85b8d4e1cc0c4b3844 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -15,7 +15,7 @@
     </div>
     <main class="flex-auto bg-background-50 p-6">
       <div class="w-96">
-        <ods-attachment-container>
+        <ods-attachment-wrapper>
           <ods-attachment
             caption="Mein_2Bescheid.pdf"
             description="234 kB"
@@ -39,7 +39,7 @@
             fileType="pdf"
           >
           </ods-attachment>
-        </ods-attachment-container>
+        </ods-attachment-wrapper>
       </div>
 
       <form id="antrag_bescheiden_form" [formGroup]="exampleForm">
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 58a09ee4d02b29261200d0f6f0db78b2bda20baa..5d64b15a623f2330d29201455ec298907bcd94fa 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -5,8 +5,8 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import {
   AttachmentComponent,
-  AttachmentContainerComponent,
   AttachmentIconComponent,
+  AttachmentWrapperComponent,
   BescheidGenerateIconComponent,
   BescheidUploadIconComponent,
   ButtonCardComponent,
@@ -34,7 +34,7 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
   imports: [
     CommonModule,
     AttachmentComponent,
-    AttachmentContainerComponent,
+    AttachmentWrapperComponent,
     ButtonComponent,
     ButtonCardComponent,
     FileUploadButtonComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.html
index 8c0d2203d740cd0bba3db4dc9d8642178677d0ae..09e3689508466b42cb14f601cef86e5e1e82637c 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.html
@@ -1,5 +1,5 @@
 <div class="flex max-w-xl flex-col gap-4">
-  <ods-bescheid-container
+  <ods-bescheid-wrapper
     *ngFor="let bescheid of bescheidList | toEmbeddedResources: bescheidListLinkRel.BESCHEID_LIST"
     data-test-id="bescheid-container-in-vorgang"
   >
@@ -23,5 +23,5 @@
       [resource]="bescheid"
       [linkRel]="bescheidLinkRel.ATTACHMENTS"
     ></alfa-binary-file-list-container>
-  </ods-bescheid-container>
+  </ods-bescheid-wrapper>
 </div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.spec.ts
index e0d873aa1642ddef9bbd08cf7ced139549f24b50..60b406d0b6ac33394f4fbf38e16e8f22bcd0aa31 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.spec.ts
@@ -5,7 +5,7 @@ import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-u
 import { DatePipe } from '@angular/common';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { BescheidContainerComponent, BescheidStatusTextComponent } from '@ods/system';
+import { BescheidStatusTextComponent, BescheidWrapperComponent } from '@ods/system';
 import {
   createBescheidListResource,
   createBescheidResource,
@@ -37,7 +37,7 @@ describe('BescheidListInVorgangComponent', () => {
         MockComponent(DocumentInBescheidContainerComponent),
         MockComponent(BinaryFileListContainerComponent),
         MockComponent(BescheidStatusTextComponent),
-        MockComponent(BescheidContainerComponent),
+        MockComponent(BescheidWrapperComponent),
       ],
     }).compileComponents();
 
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.html
index aefc4c75af7cfc3bf0669e8c9fb99665f464fde4..464b7a0a4ff8783533e4160bc53d3c007eae5eed 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.html
@@ -1,9 +1,9 @@
 <ng-container *ngIf="documentStateResource$ | async as documentStateResource">
-  <ods-attachment-container>
+  <ods-attachment-wrapper>
     <alfa-binary-file-uri-container
       *ngIf="documentStateResource.resource | hasLink: documentLinkRel.FILE"
       data-test-class="binary-file-uri-container"
       [binaryFileUri]="documentStateResource.resource | getUrl: documentLinkRel.FILE"
     ></alfa-binary-file-uri-container>
-  </ods-attachment-container>
+  </ods-attachment-wrapper>
 </ng-container>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.spec.ts
index f005143e8fcd38ef21d5fe5a41753b7f98c347a6..6d4e62565ec7e6fa5e80f193cfa8c8c56fc2885d 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component.spec.ts
@@ -16,7 +16,7 @@ import {
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import faker from '@faker-js/faker';
 import { ResourceUri, getUrl } from '@ngxp/rest';
-import { AttachmentContainerComponent } from '@ods/system';
+import { AttachmentWrapperComponent } from '@ods/system';
 import { DocumentLinkRel } from 'libs/bescheid-shared/src/lib/document.linkrel';
 import { DocumentResource } from 'libs/bescheid-shared/src/lib/document.model';
 import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
@@ -45,7 +45,7 @@ describe('DocumentInBescheidContainerComponent', () => {
         HasLinkPipe,
         GetUrlPipe,
         MockComponent(BinaryFileUriContainerComponent),
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index ab43b96faec19afccbfddc606e2b0b942174c012..e6faf4a67f1e937d0aab66ae583415d8a4030bd9 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -16,8 +16,8 @@ import { CreateBescheidButtonContainerComponent } from './create-bescheid-button
 import { CreateBescheidButtonComponent } from './create-bescheid-button-container/create-bescheid-button/create-bescheid-button.component';
 
 import {
-  BescheidContainerComponent,
   BescheidStatusTextComponent,
+  BescheidWrapperComponent,
   CloseIconComponent,
   StampIconComponent,
 } from '@ods/system';
@@ -31,7 +31,7 @@ import {
     UiModule,
     CommandSharedModule,
     BescheidStatusTextComponent,
-    BescheidContainerComponent,
+    BescheidWrapperComponent,
     StampIconComponent,
     CloseIconComponent,
   ],
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
index ccb6ff68ca977040b551bbccdae63a27b5122617..bdd7a27733a69d622edeb8e8abff53f5eb8c8d2b 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
@@ -1,5 +1,5 @@
-<ods-attachment-container>
+<ods-attachment-wrapper>
   <alfa-binary-file-list
     [binaryFileListStateResource]="binaryFileListStateResource$ | async"
   ></alfa-binary-file-list>
-</ods-attachment-container>
+</ods-attachment-wrapper>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
index 861fc464fac3928e8c5a25ff71fcd93031abfa13..1541adfb3f823192df4745d1534ab7ca2478df01 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
@@ -11,7 +11,7 @@ import { of } from 'rxjs';
 import { BinaryFileListContainerComponent } from './binary-file-list-container.component';
 import { BinaryFileListComponent } from './binary-file-list/binary-file-list.component';
 
-import { AttachmentContainerComponent } from '@ods/system';
+import { AttachmentWrapperComponent } from '@ods/system';
 
 describe('BinaryFileListContainerComponent', () => {
   let component: BinaryFileListContainerComponent;
@@ -30,7 +30,7 @@ describe('BinaryFileListContainerComponent', () => {
       declarations: [
         BinaryFileListContainerComponent,
         MockComponent(BinaryFileListComponent),
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.html b/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.html
index bd452e3e647ee15ed78a06b3e75374873c3f7b8d..151e285f62a4e2172b0e73216f5d87d2b952b370 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="binaryFileStateResource$ | async as binaryFileStateResource">
-  <ods-attachment-container>
+  <ods-attachment-wrapper>
     <alfa-binary-file2-container
       *ngIf="binaryFileStateResource.resource as binaryFile"
       data-test-class="binary-file-container"
@@ -7,5 +7,5 @@
       [isLoading]="binaryFileStateResource.loading"
       [deletable]="false"
     ></alfa-binary-file2-container>
-  </ods-attachment-container>
+  </ods-attachment-wrapper>
 </ng-container>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.spec.ts
index 34d0358a03a8f651acba5a8335d860df4e8578c8..aae6a51a88b786e34f5a003f9e99aad917697b1c 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-uri-container/binary-file-uri-container.component.spec.ts
@@ -21,7 +21,7 @@ import { of } from 'rxjs';
 import { BinaryFile2ContainerComponent } from '../binary-file2-container/binary-file2-container.component';
 import { BinaryFileUriContainerComponent } from './binary-file-uri-container.component';
 
-import { AttachmentContainerComponent } from '@ods/system';
+import { AttachmentWrapperComponent } from '@ods/system';
 
 describe('BinaryFileUriContainerComponent', () => {
   let component: BinaryFileUriContainerComponent;
@@ -37,7 +37,7 @@ describe('BinaryFileUriContainerComponent', () => {
       declarations: [
         BinaryFileUriContainerComponent,
         MockComponent(BinaryFile2ContainerComponent),
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
index 16f85f0f4bf20bdb15dde24aa504acd06023de5b..dedbaf709047ba315f2356095191e7e2e2f1387a 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
@@ -27,7 +27,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import {
   AttachmentComponent,
-  AttachmentContainerComponent,
+  AttachmentWrapperComponent,
   CloseIconComponent,
   SpinnerIconComponent,
 } from '@ods/system';
@@ -49,7 +49,7 @@ import { VerticalBinaryFileListComponent } from './vertical-binary-file-list/ver
     UiModule,
     TechSharedModule,
     AttachmentComponent,
-    AttachmentContainerComponent,
+    AttachmentWrapperComponent,
     SpinnerIconComponent,
     CloseIconComponent,
   ],
diff --git a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
index 4fd920949bfba0901c6af125b4bee882edb6468a..420f3fb74cb0fb0ee42464c49bc2fd07090405e1 100644
--- a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
+++ b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
@@ -24,7 +24,7 @@
 
 -->
 <ozgcloud-spinner [stateResource]="binaryFileListStateResource">
-  <ods-attachment-container [title]="title" data-test-id="file-list">
+  <ods-attachment-wrapper [title]="title" data-test-id="file-list">
     <alfa-download-archive-file-button-container
       *ngIf="archiveDownloadUri"
       data-test-class="download-archive-file-button"
@@ -43,5 +43,5 @@
       >
       </alfa-binary-file2-container>
     </ng-container>
-  </ods-attachment-container>
+  </ods-attachment-wrapper>
 </ozgcloud-spinner>
diff --git a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
index 2cb33345d8bb25b43c7e3cd8d561e7e3cf3b7fbc..b0f73faabb85a16868585cc35b1c895456d5c4e5 100644
--- a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
@@ -32,7 +32,7 @@ import { SpinnerComponent } from '@alfa-client/ui';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import faker from '@faker-js/faker';
 import { ResourceUri } from '@ngxp/rest';
-import { AttachmentContainerComponent } from '@ods/system';
+import { AttachmentWrapperComponent } from '@ods/system';
 import {
   createBinaryFileListResource,
   createBinaryFileResource,
@@ -56,7 +56,7 @@ describe('VerticalBinaryFileListComponent', () => {
       declarations: [
         VerticalBinaryFileListComponent,
         ToEmbeddedResourcesPipe,
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
         MockComponent(BinaryFile2ContainerComponent),
         MockComponent(SpinnerComponent),
         MockComponent(DownloadArchiveFileButtonContainerComponent),
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 662fc90c2e4fd49940fd66452f54d5e1c50cb7fa..7456205d902558317cf19c0cb5486f4baa841b39 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -1,7 +1,7 @@
-export * from './lib/attachment-container/attachment-container.component';
+export * from './lib/attachment-wrapper/attachment-wrapper.component';
 export * from './lib/attachment/attachment.component';
-export * from './lib/bescheid-container/bescheid-container.component';
 export * from './lib/bescheid-status-text/bescheid-status-text.component';
+export * from './lib/bescheid-wrapper/bescheid-wrapper.component';
 export * from './lib/button-card/button-card.component';
 export * from './lib/button/button.component';
 export * from './lib/form/error-message/error-message.component';
diff --git a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.spec.ts b/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.spec.ts
deleted file mode 100644
index 5c799383d81b51dd6df2350ed794ed09c999df1f..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AttachmentContainerComponent } from './attachment-container.component';
-
-describe('AttachmentContainerComponent', () => {
-  let component: AttachmentContainerComponent;
-  let fixture: ComponentFixture<AttachmentContainerComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [AttachmentContainerComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(AttachmentContainerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.spec.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.spec.ts
similarity index 50%
rename from alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.spec.ts
index 32b8fc6eadf7d114d8730894bd5d666e33b7bc81..bc771a072c51f229dd9c2d68262a32a2f3db915b 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.spec.ts
@@ -1,16 +1,16 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { BescheidContainerComponent } from './bescheid-container.component';
+import { AttachmentWrapperComponent } from './attachment-wrapper.component';
 
-describe('BescheidContainerComponent', () => {
-  let component: BescheidContainerComponent;
-  let fixture: ComponentFixture<BescheidContainerComponent>;
+describe('AttachmentWrapperComponent', () => {
+  let component: AttachmentWrapperComponent;
+  let fixture: ComponentFixture<AttachmentWrapperComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [BescheidContainerComponent],
+      imports: [AttachmentWrapperComponent],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(BescheidContainerComponent);
+    fixture = TestBed.createComponent(AttachmentWrapperComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.ts
similarity index 87%
rename from alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts
rename to alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.ts
index 92e995d22052d4f4ff215f7ee29f27e3ee68e7e5..414163e94f066a63e1ab6603f96c0decaedff551 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
 @Component({
-  selector: 'ods-attachment-container',
+  selector: 'ods-attachment-wrapper',
   standalone: true,
   imports: [CommonModule],
   styles: [
@@ -14,6 +14,6 @@ import { Component, Input } from '@angular/core';
     </div>
     <ng-content></ng-content>`,
 })
-export class AttachmentContainerComponent {
+export class AttachmentWrapperComponent {
   @Input() title: string = '';
 }
diff --git a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
similarity index 64%
rename from alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts
rename to alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
index f1b9e39b08b56dfd6844ddc148c7d5276a167296..485acda2600b59166e331fe38bffba7392c1e783 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
@@ -3,21 +3,21 @@ import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@story
 import { DownloadButtonComponent } from '../../../../design-component/src/lib/download-button/download-button.component';
 
 import { AttachmentComponent } from '../attachment/attachment.component';
-import { AttachmentContainerComponent } from './attachment-container.component';
+import { AttachmentWrapperComponent } from './attachment-wrapper.component';
 
-const meta: Meta<AttachmentContainerComponent> = {
-  title: 'Containers/Attachment container',
-  component: AttachmentContainerComponent,
+const meta: Meta<AttachmentWrapperComponent> = {
+  title: 'Wrappers/Attachment wrapper',
+  component: AttachmentWrapperComponent,
   parameters: {
     docs: {
       description: {
-        component: 'Container for multiple attachments',
+        component: 'Wrapper for multiple attachments',
       },
     },
   },
   decorators: [
     moduleMetadata({
-      imports: [AttachmentContainerComponent, AttachmentComponent, DownloadButtonComponent],
+      imports: [AttachmentWrapperComponent, AttachmentComponent, DownloadButtonComponent],
     }),
   ],
   excludeStories: /.*Data$/,
@@ -25,7 +25,7 @@ const meta: Meta<AttachmentContainerComponent> = {
 };
 
 export default meta;
-type Story = StoryObj<AttachmentContainerComponent>;
+type Story = StoryObj<AttachmentWrapperComponent>;
 
 export const Default: Story = {
   args: {
@@ -38,10 +38,10 @@ export const Default: Story = {
   },
   render: (args) => ({
     props: args,
-    template: `<ods-attachment-container ${argsToTemplate(args)}>
+    template: `<ods-attachment-wrapper ${argsToTemplate(args)}>
         <ods-download-button action-buttons />
         <ods-attachment caption="Attachment" description="200 kB" fileType="pdf"></ods-attachment>
         <ods-attachment caption="Second attachment" description="432 kB" fileType="doc"></ods-attachment>
-    </ods-attachment-container>`,
+    </ods-attachment-wrapper>`,
   }),
 };
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.spec.ts b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..741c0bb800a3c711eb0771d36c00fa55feb38dee
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWrapperComponent } from './bescheid-wrapper.component';
+
+describe('BescheidWrapperComponent', () => {
+  let component: BescheidWrapperComponent;
+  let fixture: ComponentFixture<BescheidWrapperComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [BescheidWrapperComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BescheidWrapperComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.ts b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.ts
similarity index 54%
rename from alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.ts
rename to alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.ts
index 16f18a8cc4c562567f48be52c279bba2aa139ac3..62f2564416b0855318c87c4fa3b0c2b2b9b47912 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-container.component.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.component.ts
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'ods-bescheid-container',
+  selector: 'ods-bescheid-wrapper',
   standalone: true,
   imports: [CommonModule],
-  template: ` <article class="bg-background-150 flex flex-col gap-4 rounded-lg p-4">
+  template: ` <article class="flex flex-col gap-4 rounded-lg bg-background-150 p-4">
     <ng-content></ng-content>
   </article>`,
 })
-export class BescheidContainerComponent {}
+export class BescheidWrapperComponent {}
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-comtainer.stories.ts b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.stories.ts
similarity index 60%
rename from alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-comtainer.stories.ts
rename to alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.stories.ts
index b0fc0da094793d9e46009e818b7f365a0f4f72ff..2d3a4ee07f081623052bb6b16e76cbb42dcd8c40 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-container/bescheid-comtainer.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-wrapper/bescheid-wrapper.stories.ts
@@ -1,17 +1,17 @@
 import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 
-import { AttachmentContainerComponent } from '../attachment-container/attachment-container.component';
+import { AttachmentWrapperComponent } from '../attachment-wrapper/attachment-wrapper.component';
 import { AttachmentComponent } from '../attachment/attachment.component';
 import { BescheidStatusTextComponent } from '../bescheid-status-text/bescheid-status-text.component';
-import { BescheidContainerComponent } from './bescheid-container.component';
+import { BescheidWrapperComponent } from './bescheid-wrapper.component';
 
-const meta: Meta<BescheidContainerComponent> = {
-  title: 'Containers/Bescheid container',
-  component: BescheidContainerComponent,
+const meta: Meta<BescheidWrapperComponent> = {
+  title: 'Wrappers/Bescheid wrapper',
+  component: BescheidWrapperComponent,
   parameters: {
     docs: {
       description: {
-        component: 'Container for bescheid information',
+        component: 'Wrapper for bescheid information',
       },
     },
   },
@@ -19,8 +19,8 @@ const meta: Meta<BescheidContainerComponent> = {
     moduleMetadata({
       imports: [
         AttachmentComponent,
-        AttachmentContainerComponent,
-        BescheidContainerComponent,
+        AttachmentWrapperComponent,
+        BescheidWrapperComponent,
         BescheidStatusTextComponent,
       ],
     }),
@@ -30,20 +30,20 @@ const meta: Meta<BescheidContainerComponent> = {
 };
 
 export default meta;
-type Story = StoryObj<BescheidContainerComponent>;
+type Story = StoryObj<BescheidWrapperComponent>;
 
 export const Default: Story = {
   render: () => ({
-    template: `<ods-bescheid-container>
+    template: `<ods-bescheid-wrapper>
         <ods-bescheid-status-text
             bewilligt="true"
             dateText="13.11.2024"
             [hasBescheidDraft]="false"
         ></ods-bescheid-status-text>
-        <ods-attachment-container>
+        <ods-attachment-wrapper>
             <ods-attachment caption="Attachment" description="200 kB" fileType="pdf"></ods-attachment>
             <ods-attachment caption="Second attachment" description="432 kB" fileType="doc"></ods-attachment>
-        </ods-attachment-container>
-    </ods-bescheid-container>`,
+        </ods-attachment-wrapper>
+    </ods-bescheid-wrapper>`,
   }),
 };
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
index 95e424d51d4542bce8bc97612cd8f632bca51b48..ff4e542e0d9181e9ee7bc98b468e62b2a1d23482 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
@@ -1,4 +1,4 @@
-<ods-attachment-container>
+<ods-attachment-wrapper>
   <alfa-binary-file2-container
     *ngFor="let attachment of existingAttachments"
     [file]="attachment"
@@ -27,4 +27,4 @@
       [isLoading]="uploadFileInProgress.loading"
     ></ods-attachment>
   </ng-container>
-</ods-attachment-container>
+</ods-attachment-wrapper>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
index 38a32fe726c44d6f7c0152e0caec38bfb8c90791..63758c537759f45fbe750b6c286b6b2e5778864d 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
@@ -14,11 +14,7 @@ import { existsAsHtmlElement, Mock, mock, notExistsAsHtmlElement } from '@alfa-c
 import { OzgcloudSvgIconComponent, SpinnerComponent } from '@alfa-client/ui';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import {
-  AttachmentComponent,
-  AttachmentContainerComponent,
-  SpinnerIconComponent,
-} from '@ods/system';
+import { AttachmentComponent, AttachmentWrapperComponent, SpinnerIconComponent } from '@ods/system';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { BehaviorSubject, EMPTY, Observable, of, Subscription } from 'rxjs';
 import { createUploadFileInProgress } from '../../../../../../../bescheid-shared/src/test/bescheid';
@@ -58,7 +54,7 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
         MockPipe(ConvertApiErrorToErrorMessagesPipe),
         MockComponent(OzgcloudSvgIconComponent),
         MockComponent(SpinnerComponent),
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
         MockComponent(BinaryFile2ContainerComponent),
         MockComponent(SpinnerIconComponent),
         MockComponent(AttachmentComponent),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
index 2080ba5b2a7b977a0837a437c97ae3d1579ba396..bb762af88d7b449d222804be6eccd2be60690f5e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
@@ -5,7 +5,7 @@
 >
   Bitte fügen Sie ein Bescheiddokument hinzu.
 </p>
-<ods-attachment-container>
+<ods-attachment-wrapper>
   <ng-container *ngIf="bescheidDocumentFile.resource">
     <alfa-binary-file2-container
       *ngIf="
@@ -39,4 +39,4 @@
     [errorMessages]="createDocumentErrorMessages"
     data-test-id="create-bescheid-document-attachment"
   ></ods-attachment>
-</ods-attachment-container>
+</ods-attachment-wrapper>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
index 15a99f1bea6f85d4287f1ca9d0a85fffc4144dbc..c61b90e368bb525ef644dfd2e95d156c06338d22 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
@@ -3,14 +3,14 @@ import { BinaryFile2ContainerComponent } from '@alfa-client/binary-file';
 import { CommandResource } from '@alfa-client/command-shared';
 import {
   ConvertApiErrorToErrorMessagesPipe,
+  StateResource,
   createEmptyStateResource,
   createStateResource,
-  StateResource,
 } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, Mock, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { Mock, existsAsHtmlElement, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { getUrl } from '@ngxp/rest';
-import { AttachmentComponent, AttachmentContainerComponent } from '@ods/system';
+import { AttachmentComponent, AttachmentWrapperComponent } from '@ods/system';
 import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
 import { createBinaryFileResource } from 'libs/binary-file-shared/test/binary-file';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -47,7 +47,7 @@ describe('VorgangDetailBescheidenResultDokumentComponent', () => {
         VorgangDetailBescheidenResultDokumentComponent,
         MockComponent(BinaryFile2ContainerComponent),
         MockComponent(AttachmentComponent),
-        MockComponent(AttachmentContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
         MockPipe(ConvertApiErrorToErrorMessagesPipe),
       ],
       providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index db2d110743c6cf74d30cba957fbed207bf55a126..5a6d84231e9b41aa3bc51655315edd6ff5e4e531 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -49,7 +49,7 @@ import {
 } from '@ods/component';
 import {
   AttachmentComponent,
-  AttachmentContainerComponent,
+  AttachmentWrapperComponent,
   BescheidGenerateIconComponent,
   BescheidStatusTextComponent,
   BescheidUploadIconComponent,
@@ -153,7 +153,7 @@ const routes: Routes = [
     BescheidUploadIconComponent,
     BescheidGenerateIconComponent,
     AttachmentComponent,
-    AttachmentContainerComponent,
+    AttachmentWrapperComponent,
     ButtonWithSpinnerComponent,
     FileUploadEditorComponent,
     SingleFileUploadEditorComponent,