diff --git a/goofy-client/apps/goofy/src/app/app.component.html b/goofy-client/apps/goofy/src/app/app.component.html
index 7360ab52d3d45dae66f0477541d9e4cff0a4c3a4..19274543c522ce96599998cf15b177b30c4612d7 100644
--- a/goofy-client/apps/goofy/src/app/app.component.html
+++ b/goofy-client/apps/goofy/src/app/app.component.html
@@ -24,7 +24,7 @@
 
 -->
 <ng-container *ngIf="apiRoot$ | async as apiRoot">
-	<alfa-spinner [stateResource]="apiRoot">
+	<ozgcloud-spinner [stateResource]="apiRoot">
 		<alfa-header-container [apiRootStateResource]="apiRoot"></alfa-header-container>
 
 		<div class="container">
@@ -34,5 +34,5 @@
 				<alfa-build-info *ngIf="apiRoot.resource" [apiRoot]="apiRoot.resource" data-test-id="build-info"></alfa-build-info>
 			</section>
 		</div>
-	</alfa-spinner>
+	</ozgcloud-spinner>
 </ng-container>
diff --git a/goofy-client/apps/goofy/src/styles/material/_button.scss b/goofy-client/apps/goofy/src/styles/material/_button.scss
index 3e6638d048e83e2e96b6a5026f3d4c868b3bf5a6..1a4428a2dbed949fadaab221ed6371e16c10c00a 100644
--- a/goofy-client/apps/goofy/src/styles/material/_button.scss
+++ b/goofy-client/apps/goofy/src/styles/material/_button.scss
@@ -5,8 +5,8 @@
 	$color-config: mat.get-color-config($theme);
 	$primary: map.get($color-config, 'primary');
 
-	alfa-ozgcloud-button-with-spinner,
-	alfa-ozgcloud-stroked-button-with-spinner {
+	ozgcloud-button-with-spinner,
+	ozgcloud-stroked-button-with-spinner {
 		.mat-primary svg path {
 			fill: mat.get-color-from-palette($primary);
 		}
diff --git a/goofy-client/apps/goofy/src/styles/material/_dialog.scss b/goofy-client/apps/goofy/src/styles/material/_dialog.scss
index 161241da9d74c31f28563e1e7858f594d12d0815..4d3bedaf252b5c1e72232bc9f87ba245feffa5f0 100644
--- a/goofy-client/apps/goofy/src/styles/material/_dialog.scss
+++ b/goofy-client/apps/goofy/src/styles/material/_dialog.scss
@@ -16,7 +16,7 @@
 		padding-top: 16px !important;
 	}
 
-	alfa-fixed-dialog .mat-mdc-dialog-title {
+	ozgcloud-fixed-dialog .mat-mdc-dialog-title {
 		margin-bottom: 0 !important;
 		padding-top: 0 !important;
 	}
diff --git a/goofy-client/apps/goofy/src/styles/material/_expansion-panel.scss b/goofy-client/apps/goofy/src/styles/material/_expansion-panel.scss
index 2016ef527d42d49c1b64d58ec771e35d58117fd4..bbf2ad6d5a78048f83af97cc59439dd5e2de4b41 100644
--- a/goofy-client/apps/goofy/src/styles/material/_expansion-panel.scss
+++ b/goofy-client/apps/goofy/src/styles/material/_expansion-panel.scss
@@ -29,11 +29,11 @@
 	$color-config: mat.get-color-config($theme);
 	$primary-palette: map.get($color-config, 'primary');
 
-	alfa-expansion-panel h3 {
+	ozgcloud-expansion-panel h3 {
 		color: mat.get-color-from-palette($primary-palette);
 	}
 
-	body.mat-typography alfa-expansion-panel {
+	body.mat-typography ozgcloud-expansion-panel {
 		.mat-expansion-panel-header {
 			padding: 0 !important;
 			height: 44px !important;
@@ -50,7 +50,7 @@
 			padding: 0 0 16px 56px;
 		}
 
-		alfa-expansion-panel {
+		ozgcloud-expansion-panel {
 			.mat-expansion-panel-header {
 				height: 40px !important;
 			}
@@ -73,7 +73,7 @@
 		}
 	}
 
-	body.mat-typography alfa-expansion-panel-with-user {
+	body.mat-typography ozgcloud-expansion-panel-with-user {
 		.mat-expansion-panel-body {
 			padding: 0 0 0 32px;
 		}
diff --git a/goofy-client/apps/goofy/src/styles/material/_formfield.scss b/goofy-client/apps/goofy/src/styles/material/_formfield.scss
index a82011ff2121d0199a089148e25c6a0217867e48..7f5cce59fb76e286f418d38fedf6364f884c80fe 100644
--- a/goofy-client/apps/goofy/src/styles/material/_formfield.scss
+++ b/goofy-client/apps/goofy/src/styles/material/_formfield.scss
@@ -13,7 +13,7 @@ alfa-vorgang-search {
 	}
 }
 
-alfa-fixed-dialog {
+ozgcloud-fixed-dialog {
 	.mat-mdc-form-field-focus-overlay,
 	.mdc-text-field--filled:not(.mdc-text-field--disabled) {
 		background-color: transparent !important;
diff --git a/goofy-client/apps/goofy/src/styles/material/_snackbar.scss b/goofy-client/apps/goofy/src/styles/material/_snackbar.scss
index d1885b6be61bb2d62f0d6545181321ffbfde2d53..cc36ed9e78aaed9e699a4c34b31a6327506ebc57 100644
--- a/goofy-client/apps/goofy/src/styles/material/_snackbar.scss
+++ b/goofy-client/apps/goofy/src/styles/material/_snackbar.scss
@@ -1,5 +1,5 @@
 .mat-mdc-snack-bar-container {
-	alfa-snackbar-info > button {
+	ozgcloud-snackbar-info > button {
 		color: #2196f3 !important;
 		height: 24px !important;
 	}
diff --git a/goofy-client/libs/bescheid/src/lib/create-bescheid-button-container/create-bescheid-button/create-bescheid-button.component.html b/goofy-client/libs/bescheid/src/lib/create-bescheid-button-container/create-bescheid-button/create-bescheid-button.component.html
index 3b3eec8b356f0b579273b1bac0fc8758eef80bec..cd4c0f6240ce2b57a89cf296e61803623a5de0ac 100644
--- a/goofy-client/libs/bescheid/src/lib/create-bescheid-button-container/create-bescheid-button/create-bescheid-button.component.html
+++ b/goofy-client/libs/bescheid/src/lib/create-bescheid-button-container/create-bescheid-button/create-bescheid-button.component.html
@@ -1,6 +1,6 @@
-<alfa-icon-button-with-spinner data-test-id="create-bescheid-icon-button"
+<ozgcloud-icon-button-with-spinner data-test-id="create-bescheid-icon-button"
 	icon="description"
 	toolTip="Bescheid erstellen"
 	[stateResource]="createBescheidCommand"
 	(clickEmitter)="createBescheid.emit()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/binary-file/src/lib/binary-file-attachment-container/binary-file-attachment-container.component.html b/goofy-client/libs/binary-file/src/lib/binary-file-attachment-container/binary-file-attachment-container.component.html
index ae8d0c82d995eb69ad0d8b8ecbbbf38e2e77d1ea..e28204da7e022b58ba432ab2cb94c2572534f267 100644
--- a/goofy-client/libs/binary-file/src/lib/binary-file-attachment-container/binary-file-attachment-container.component.html
+++ b/goofy-client/libs/binary-file/src/lib/binary-file-attachment-container/binary-file-attachment-container.component.html
@@ -30,9 +30,9 @@
 	</alfa-binary-file-container>
 </div>
 
-<alfa-file-upload-editor *ngIf="uploadStateResource.resource | hasLink: linkRelUploadAttachment" data-test-id="binary-file-upload"
+<ozgcloud-file-upload-editor *ngIf="uploadStateResource.resource | hasLink: linkRelUploadAttachment" data-test-id="binary-file-upload"
     [parentFormArrayName]="formArrayName"
     [fileLinkList]="getFileUriList()"
     [uploadInProgress]="uploadInProgress$ | async"
 	(newFile)="uploadFile($event)">
-</alfa-file-upload-editor>
+</ozgcloud-file-upload-editor>
diff --git a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.html b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.html
index c53ae3e647cb90aeb623294579cc0f2e79eb65fc..7d8145ff264cae7adf203b8f92f4568e575ba536 100644
--- a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.html
+++ b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.html
@@ -37,10 +37,10 @@
 			<span class="name">{{ file.name }}</span>
 			<span class="size" [innerHTML]="file.size | fileSize"></span>
 
-			<alfa-spinner [diameter]="22" padding="0" [stateResource]="getStateResource()" class="spinner"></alfa-spinner>
+			<ozgcloud-spinner [diameter]="22" padding="0" [stateResource]="getStateResource()" class="spinner"></ozgcloud-spinner>
 		</button>
 
 	</div>
 
-	<alfa-icon-button-with-spinner *ngIf="deletable" icon="close" (clickEmitter)="deleteFile()" data-test-class="delete-file-button"></alfa-icon-button-with-spinner>
+	<ozgcloud-icon-button-with-spinner *ngIf="deletable" icon="close" (clickEmitter)="deleteFile()" data-test-class="delete-file-button"></ozgcloud-icon-button-with-spinner>
 </div>
diff --git a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.scss b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.scss
index 7effeea4987826d8030eadadc86a5e94e902a7e6..8e240f33238c85813aec9d5d0ced579992755c91 100644
--- a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.scss
+++ b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.scss
@@ -117,7 +117,7 @@
 	align-items: center;
 }
 
-alfa-icon-button-with-spinner {
+ozgcloud-icon-button-with-spinner {
 	display: block;
 	margin: -12px 0;
 }
diff --git a/goofy-client/libs/binary-file/src/lib/horizontal-binary-file-list/horizontal-binary-file-list.component.html b/goofy-client/libs/binary-file/src/lib/horizontal-binary-file-list/horizontal-binary-file-list.component.html
index 622b00445eff3b2e6167367aff04002ca2993bbf..07f0939e478bb347b741daaf9fa2fb011f0c200d 100644
--- a/goofy-client/libs/binary-file/src/lib/horizontal-binary-file-list/horizontal-binary-file-list.component.html
+++ b/goofy-client/libs/binary-file/src/lib/horizontal-binary-file-list/horizontal-binary-file-list.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="fileListResource">
+<ozgcloud-spinner [stateResource]="fileListResource">
 
 	<div class="horizontal" data-test-id="file-list">
 		<alfa-binary-file-container
@@ -33,4 +33,4 @@
 		</alfa-binary-file-container>
 	</div>
 
-</alfa-spinner>
\ No newline at end of file
+</ozgcloud-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html b/goofy-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
index 956dd181df8e7a47ea80dd0815f064f1d4b762e4..b262532f32de1f54cac47d19917fc4b92ac45f96 100644
--- a/goofy-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
+++ b/goofy-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="fileListResource">
+<ozgcloud-spinner [stateResource]="fileListResource">
 	<div class="vertical" data-test-id="file-list">
 		<alfa-binary-file-container
 			*ngFor="let binaryFileResource of fileListResource.resource | toEmbeddedResources: fileListRel.FILE_LIST"
@@ -31,4 +31,4 @@
 			[downloadFileNamePrefix]="downloadFileNamePrefix">
 		</alfa-binary-file-container>
 	</div>
-</alfa-spinner>
+</ozgcloud-spinner>
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
index 7973e30029828419634dbd221c60cc333afc2eed..7b6083760a648e76ae46d3465acf505208ceee56 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
@@ -25,25 +25,25 @@
 -->
 <form class="form" [formGroup]="form" (submit)="submit.emit()">
 
-	<alfa-text-editor
+	<ozgcloud-text-editor
 			label="zuständige Stelle"
 			[formControlName]="formServiceClass.FIELD_EMAIL"
 			autocomplete="email"
 			placeholder="E-Mail Adresse">
-	</alfa-text-editor>
+	</ozgcloud-text-editor>
 
-	<alfa-text-editor
+	<ozgcloud-text-editor
 			label="Passwort"
 			[formControlName]="formServiceClass.FIELD_PASSWORD"
 			placeholder="Passwort für die Verschlüsselung">
-	</alfa-text-editor>
+	</ozgcloud-text-editor>
 
-	<alfa-ozgcloud-stroked-button-with-spinner dataTestId="forward-button"
+	<ozgcloud-stroked-button-with-spinner dataTestId="forward-button"
 			toolTip="Vorgang weiterleiten"
 			icon="forward"
 			type="submit"
 			text="Weiterleiten"
 			[stateResource]="forwardStateResource">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
 </form>
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
index f40faf06e8baac626af1a1b1d4575279f2eb2eaf..494b5ec561a9c9b606068e31510d7cc35822afa5 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
@@ -23,12 +23,12 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner data-test-id="forwarding-spinner"
+<ozgcloud-spinner data-test-id="forwarding-spinner"
 		[diameter]="24"
 		[show]="pendingForwardCommand.resource | hasLink: commandLinkRel.UPDATE"
 		padding="0"
 		text="Vorgang wird weitergeleitet">
-</alfa-spinner>
+</ozgcloud-spinner>
 
 <alfa-vorgang-forward-form *ngIf="vorgang | hasLink: vorgangLinkRel.FORWARD" data-test-id="forward-form"
 		[vorgang]="vorgang"
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
index 968a2707f327a3c196e8c3943ef1c5344e1b5348..737dee089f8a26fd6e7dd5d00c27ba47ad5bd55e 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
@@ -25,11 +25,11 @@
 -->
 <ng-container *ngIf="(vorgang | hasLink: vorgangLinkRel.FORWARD) || (vorgang | hasLink: vorgangLinkRel.FORWARDING)">
 
-	<alfa-expansion-panel headline="Vorgang weiterleiten" data-test-id="forwarding" *ngIf="forwardingStateResources$ |async as forwardingStateResources">
+	<ozgcloud-expansion-panel headline="Vorgang weiterleiten" data-test-id="forwarding" *ngIf="forwardingStateResources$ |async as forwardingStateResources">
 
-		<alfa-spinner [stateResource]="forwardingStateResources">
+		<ozgcloud-spinner [stateResource]="forwardingStateResources">
 			<alfa-vorgang-forwarding-info-list [forwardingList]="forwardingStateResources"></alfa-vorgang-forwarding-info-list>
-		</alfa-spinner>
+		</ozgcloud-spinner>
 
 
 		<alfa-vorgang-forward-formular data-test-id="forward-formular"
@@ -38,6 +38,6 @@
 			(doSubmit)="submit()">
 		</alfa-vorgang-forward-formular>
 
-	</alfa-expansion-panel>
+	</ozgcloud-expansion-panel>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html
index d34652c3621cef4b88629193b9878410963ab546..d09d5fb8200670f8d9975fae9e1ba9a9ab82dda0 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html
@@ -36,19 +36,19 @@
 </div>
 
 <div class="buttons">
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="forwarding | hasLink: linkRel.MARK_AS_SUCCESS"
+	<ozgcloud-stroked-button-with-spinner *ngIf="forwarding | hasLink: linkRel.MARK_AS_SUCCESS"
 			data-test-id="mark-as-success-button"
 			text="Bestätigen"
 			icon="check_circle_outline"
 			[stateResource]="markAsSuccessCommandStateResource$ | async"
 			(clickEmitter)="markAsSuccess()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="forwarding | hasLink: linkRel.MARK_AS_FAIL"
+	<ozgcloud-stroked-button-with-spinner *ngIf="forwarding | hasLink: linkRel.MARK_AS_FAIL"
 			data-test-id="mark-as-fail-button"
 			text="Widerrufen"
 			icon="info_outline"
 			[stateResource]="markAsFailCommandStateResource$ | async"
 			(clickEmitter)="markAsFail()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 </div>
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss
index 5cc89f749f16c794957968840a2affb825284e4a..fb71fab60423d679b49d557e488803eb691ce75c 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss
@@ -31,7 +31,7 @@
 	margin: 16px -8px;
 	display: flex;
 
-	alfa-ozgcloud-stroked-button-with-spinner {
+	ozgcloud-stroked-button-with-spinner {
 		margin: 0 8px;
 	}
 }
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/expansion-panel-with-user/expansion-panel-with-user.component.ts b/goofy-client/libs/historie/src/lib/historie-container/historie-list/expansion-panel-with-user/expansion-panel-with-user.component.ts
index ceafc69be734a1fc6002f2cbfec07c35fedde1d9..a4a7bdc4041127debbc839a6bec672cf2b556ac9 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/expansion-panel-with-user/expansion-panel-with-user.component.ts
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/expansion-panel-with-user/expansion-panel-with-user.component.ts
@@ -25,7 +25,7 @@ import { Component, Input } from '@angular/core';
 import { CommandResource } from '@alfa-client/command-shared';
 
 @Component({
-	selector: 'alfa-expansion-panel-with-user',
+	selector: 'ozgcloud-expansion-panel-with-user',
 	templateUrl: './expansion-panel-with-user.component.html',
 	styleUrls: ['./expansion-panel-with-user.component.scss'],
 })
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.html b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.html
index b331af12a60653bd1e10b18800247e4588adb6a6..302e6373b8197d543a750a651f323b2a45436c87 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.html
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.html
@@ -24,4 +24,4 @@
 
 -->
 <alfa-user-profile-in-historie-container *ngIf="resource | hasLink: commandLinkRel.CREATED_BY; else nonUserCommand" [command]="resource" data-test-class="user-profile-in-historie-item-header"></alfa-user-profile-in-historie-container>
-<ng-template #nonUserCommand><alfa-app-icon></alfa-app-icon><span data-test-class="system-user-in-historie-item-header">Die Anwendung</span></ng-template><p class="headline" data-test-class="historie-item-header">hat am {{(resource.createdAt | formatDateWithTimePipe: false)}} {{headline}}</p>
\ No newline at end of file
+<ng-template #nonUserCommand><ozgcloud-app-icon></ozgcloud-app-icon><span data-test-class="system-user-in-historie-item-header">Die Anwendung</span></ng-template><p class="headline" data-test-class="historie-item-header">hat am {{(resource.createdAt | formatDateWithTimePipe: false)}} {{headline}}</p>
\ No newline at end of file
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.scss b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.scss
index e531fd183365224b143b2d99cb0f9c7ff48d15de..0d3b0a33be3e2ebea67b3ff3d11af38179c20f3a 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.scss
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-header/historie-item-header.component.scss
@@ -33,6 +33,6 @@
 	margin: 0 0 0 0.5rem;
 }
 
-alfa-app-icon {
+ozgcloud-app-icon {
 	margin: 0 6px 0 2px;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-kommentar/historie-item-kommentar.component.html b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-kommentar/historie-item-kommentar.component.html
index bb74108604b5575c70f3e995f9e12425b6dbfbd8..10ecfcf75343b19b9362996dd031af39408ce594 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-kommentar/historie-item-kommentar.component.html
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-kommentar/historie-item-kommentar.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-expansion-panel-with-user [headline]="headline" [resource]="command">
+<ozgcloud-expansion-panel-with-user [headline]="headline" [resource]="command">
 	<p data-test-class="kommentar-text">{{ kommentar.text }}</p>
 	<alfa-historie-item-attachment *ngIf="kommentar.attachments" [attachments]="kommentar.attachments" data-test-class="historie-item-kommentar-attachment"></alfa-historie-item-attachment>
-</alfa-expansion-panel-with-user>
+</ozgcloud-expansion-panel-with-user>
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.html b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.html
index e767b464d95dda50eb60edb264f1940413fa7906..49be01f5392a8f00bc9deb3ef2451a8422500846 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.html
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.html
@@ -23,11 +23,11 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-expansion-panel-with-user *ngIf="postfachNachricht; else headlineOnly" [headline]="headline" [resource]="command" data-test-class="historie-item-postfach-nachricht-user-expansion-panel-with-body">
+<ozgcloud-expansion-panel-with-user *ngIf="postfachNachricht; else headlineOnly" [headline]="headline" [resource]="command" data-test-class="historie-item-postfach-nachricht-user-expansion-panel-with-body">
 	<p data-test-class="postfach-nachricht-subject" class="subject">{{postfachNachricht.subject}}</p>
 	<p data-test-class="postfach-nachricht-mail-body">{{postfachNachricht.mailBody}}</p>
 	<alfa-historie-item-attachment *ngIf="postfachNachricht.attachments" [attachments]="postfachNachricht.attachments" data-test-class="historie-item-postfach-nachricht-attachment"></alfa-historie-item-attachment>
-</alfa-expansion-panel-with-user>
+</ozgcloud-expansion-panel-with-user>
 
 <ng-template #headlineOnly>
 	<div class="mat-expansion-panel">
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-wiedervorlage/historie-item-wiedervorlage.component.html b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-wiedervorlage/historie-item-wiedervorlage.component.html
index 379847055c85616a51fe5137628021a83dd35923..0fa9e0129613593a6330983155af365dac7ff0f3 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-wiedervorlage/historie-item-wiedervorlage.component.html
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-wiedervorlage/historie-item-wiedervorlage.component.html
@@ -23,12 +23,12 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-expansion-panel-with-user *ngIf="hasBody; else headlineOnly" [headline]="headline" [resource]="command" data-test-class="historie-item-wiedervorlage-user-expansion-panel">
+<ozgcloud-expansion-panel-with-user *ngIf="hasBody; else headlineOnly" [headline]="headline" [resource]="command" data-test-class="historie-item-wiedervorlage-user-expansion-panel">
 	<alfa-historie-item-wiedervorlage-status [done]="wiedervorlage.done"></alfa-historie-item-wiedervorlage-status>
 	<p><span class="betreff" data-test-class="wiedervorlage-betreff">{{wiedervorlage.betreff}}</span>, {{wiedervorlage.frist | formatToPrettyDate}}</p>
 	<p data-test-class="wiedervorlage-beschreibung">{{wiedervorlage.beschreibung}}</p>
 	<alfa-historie-item-attachment *ngIf="wiedervorlage.attachments" [attachments]="wiedervorlage.attachments" data-test-class="historie-item-wiedervorlage-attachment"></alfa-historie-item-attachment>
-</alfa-expansion-panel-with-user>
+</ozgcloud-expansion-panel-with-user>
 <ng-template #headlineOnly>
 	<div class="mat-expansion-panel">
 		<alfa-historie-item-header [headline]="headline" [resource]="command" data-test-class="historie-item-wiedervorlage-header"></alfa-historie-item-header>
diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-list.component.html b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-list.component.html
index 7fa364fd9d1aace97beffc698efa30961ec9ea23..28545e12c5891bee39a27b0be7563aab3cc2a36d 100644
--- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-list.component.html
+++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-list.component.html
@@ -25,14 +25,14 @@
 -->
 <alfa-historie-item-vorgang-created [vorgangWithEingang]="vorgangWithEingang"></alfa-historie-item-vorgang-created>
 
-<alfa-spinner [stateResource]="commandStateListResource">
+<ozgcloud-spinner [stateResource]="commandStateListResource">
 
 	<ng-container *ngIf="commandStateListResource.resource">
-		<alfa-accordion [multi]="true">
+		<ozgcloud-accordion [multi]="true">
 				<ng-container *ngFor="let historieCommand of (commandStateListResource.resource | toEmbeddedResources: commandListLinkRel.COMMAND_LIST); index as i">
 					<alfa-historie-list-item [historieCommand]="historieCommand" [attr.data-test-id]="'historie-list-item-' + i"></alfa-historie-list-item>
 				</ng-container>
-		</alfa-accordion>
+		</ozgcloud-accordion>
 	</ng-container>
 
-</alfa-spinner>
\ No newline at end of file
+</ozgcloud-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.html b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.html
index 0884cd9c6be5f29a5f0f97d2238bda7d4d894bb8..1241941a8deb6493f0ec394f496c96bd1c54e583 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.html
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.html
@@ -25,10 +25,10 @@
 -->
 <form class="form" [formGroup]="formService.form">
 
-	<alfa-textarea-editor
+	<ozgcloud-textarea-editor
 		[formControlName]="formServiceClass.TEXT"
 		label="Kommentar">
-	</alfa-textarea-editor>
+	</ozgcloud-textarea-editor>
 
 	<alfa-binary-file-attachment-container
 		data-test-id="kommentar-attachment-list"
@@ -39,22 +39,22 @@
 	</alfa-binary-file-attachment-container>
 
 	<div class="buttons">
-		<alfa-ozgcloud-stroked-button-with-spinner
+		<ozgcloud-stroked-button-with-spinner
 			text="Speichern"
 			data-test-id="add-button"
 			icon="save_alt"
 			class="submit-button"
 			[stateResource]="submitInProgress$ | async"
 			(clickEmitter)="submit()">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 
-		<alfa-ozgcloud-stroked-button-with-spinner
+		<ozgcloud-stroked-button-with-spinner
 				text="Abbrechen"
 				data-test-id="cancel-button"
 				icon="clear"
 				color=""
 				class="cancel-button"
 				(clickEmitter)="cancel.emit()">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 	</div>
 </form>
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.scss b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.scss
index 7b2f0a1b032a7b32467f4831eccfbc8eef590f57..cecafcec6a4bbf6944989258f69f58ceb276d812 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.scss
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.scss
@@ -32,7 +32,7 @@
 	display: flex;
 	margin: 16px -8px;
 
-	alfa-ozgcloud-stroked-button-with-spinner {
+	ozgcloud-stroked-button-with-spinner {
 		margin: 0 8px;
 	}
 }
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
index 564e884799936761429c080d97bc1d16a025cc24..5c5d9566c2ae3ab9835d9a0f12e135cf29644912 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
@@ -25,12 +25,12 @@
 -->
 <ng-container *ngIf="kommentarListStateResource$ | async as kommentarListStateResource">
 
-	<alfa-expansion-panel headline="Kommentare">
+	<ozgcloud-expansion-panel headline="Kommentare">
 		<alfa-kommentar-list-in-vorgang
 			[kommentarListStateResource]="kommentarListStateResource"
 			data-test-id="kommentar-list-in-vorgang">
 		</alfa-kommentar-list-in-vorgang>
-	</alfa-expansion-panel>
+	</ozgcloud-expansion-panel>
 
 	<alfa-kommentar-form
 		*ngIf="showFormular$ | async"
@@ -40,13 +40,13 @@
 		data-test-id="kommentar-formular">
 	</alfa-kommentar-form>
 
-	<alfa-ozgcloud-stroked-button-with-spinner
+	<ozgcloud-stroked-button-with-spinner
 		*ngIf="canCreateNewKommentar$ | async"
 		(clickEmitter)="showFormular()"
 		class="create-button"
 		text="Kommentar"
 		icon="add"
 		dataTestId="create-kommentar">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
 </ng-container>
diff --git a/goofy-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html b/goofy-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
index 3735b76f927a95a6f75468a34f4e07b3119b16ba..a61f3a7afa2150aa494f499b2c336c3a1fd7e748 100644
--- a/goofy-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
+++ b/goofy-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
@@ -1,11 +1,11 @@
-<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="endgueltig-loeschen-button"
+<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="endgueltig-loeschen-button"
 	text="Endgültig löschen"
 	svgIcon="delete_finally"
 	(clickEmitter)="endgueltigLoeschen.emit()">
-</alfa-ozgcloud-stroked-button-with-spinner>
+</ozgcloud-stroked-button-with-spinner>
 
-<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="endgueltig-loeschen-icon-button"
+<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="endgueltig-loeschen-icon-button"
 	toolTip="Endgültig löschen"
 	svgIcon="delete_finally"
 	(clickEmitter)="endgueltigLoeschen.emit()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html b/goofy-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
index 1ac09e8fefbadcfa12d325a3b0fabcc1e7341c67..7874ddf1c8c8fe9e225b3175d9b640df90aaa110 100644
--- a/goofy-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
+++ b/goofy-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
@@ -1,13 +1,13 @@
-<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="loesch-anforderung-zuruecknehmen-button"
+<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="loesch-anforderung-zuruecknehmen-button"
 	text="Löschanforderung zurücknehmen"
 	svgIcon="undo_request_deletion"
 	[stateResource]="loeschAnforderungZuruecknehmenCommand"
 	(clickEmitter)="loeschAnforderungZuruecknehmen.emit()">
-</alfa-ozgcloud-stroked-button-with-spinner>
+</ozgcloud-stroked-button-with-spinner>
 
-<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="loesch-anforderung-zuruecknehmen-icon-button"
+<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="loesch-anforderung-zuruecknehmen-icon-button"
 	svgIcon="undo_request_deletion"
 	toolTip="Löschanforderung zurücknehmen"
 	[stateResource]="loeschAnforderungZuruecknehmenCommand"
 	(clickEmitter)="loeschAnforderungZuruecknehmen.emit()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html b/goofy-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
index 606b0a0edb97960987c7ce22b2d16fc415a8f407..3837761af87a41f9d0695b0171783c8db59e4d16 100644
--- a/goofy-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
+++ b/goofy-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
@@ -1,13 +1,13 @@
-<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="loeschen-anfordern-button"
+<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="loeschen-anfordern-button"
 	text="Löschen anfordern"
 	svgIcon="request_deletion"
 	[stateResource]="loeschenAnfordernCommand"
 	(clickEmitter)="loeschenAnfordern.emit()">
-</alfa-ozgcloud-stroked-button-with-spinner>
+</ozgcloud-stroked-button-with-spinner>
 
-<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="loeschen-anfordern-icon-button"
+<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="loeschen-anfordern-icon-button"
 	svgIcon="request_deletion"
 	toolTip="Löschen anfordern"
 	[stateResource]="loeschenAnfordernCommand"
 	(clickEmitter)="loeschenAnfordern.emit()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 5a3578f0fdcf68ce223cca7b67dd28c9e3d642eb..f7c6609b22c151d9359225d2593f6f092e0de11b 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -25,27 +25,27 @@
 -->
 <ng-container *ngIf="postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL">
 	<!-- TODO Aufteilen in 3 einzelne Komponenten -->
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton && text && !toolTip" data-test-id="create-mail-button-with-text"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton && text && !toolTip" data-test-id="create-mail-button-with-text"
 		[showSpinner]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
 		class="create-button"
 		[text]="text"
 		icon="add"
 		(clickEmitter)="openPostfachNachrichtenDialog.emit()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton && !text && toolTip" data-test-id="create-mail-button-without-text"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton && !text && toolTip" data-test-id="create-mail-button-without-text"
 		[showSpinner]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
 		class="create-button"
 		[toolTip]="toolTip"
 		icon="add"
 		(clickEmitter)="openPostfachNachrichtenDialog.emit()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="send-mail-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="send-mail-icon-button"
 		[showSpinner]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
 		icon="mail_outline"
 		toolTip="Neue Nachricht erstellen"
 		(clickEmitter)="openPostfachNachrichtenDialog.emit()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.html
index 41f403aa12603e6f3706fbc4f6ebc73c4efa18a5..80d11e50f34943c9fbc36500ae1514c0162c6355 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.html
@@ -30,26 +30,26 @@
 
 <form [formGroup]="formService.form" (ngSubmit)="submit()">
 
-	<alfa-text-editor [formControlName]="formServiceClass.FIELD_SUBJECT"
+	<ozgcloud-text-editor [formControlName]="formServiceClass.FIELD_SUBJECT"
 			label="Betreff"
 			[autoFocus]="true">
-	</alfa-text-editor>
-	<alfa-textarea-editor [formControlName]="formServiceClass.FIELD_MAIL_BODY"
+	</ozgcloud-text-editor>
+	<ozgcloud-textarea-editor [formControlName]="formServiceClass.FIELD_MAIL_BODY"
 			label="Text"
 			class="message-editor">
-	</alfa-textarea-editor>
+	</ozgcloud-textarea-editor>
 
 	<alfa-postfach-nachricht-attachment-container [postfachNachricht]="dialogData.postfachNachricht"></alfa-postfach-nachricht-attachment-container>
 
 	<div class="button-bar-bottom">
 
-		<alfa-ozgcloud-stroked-button-with-spinner data-test-id="postfach-send-button"
+		<ozgcloud-stroked-button-with-spinner data-test-id="postfach-send-button"
 			[stateResource]="sendInProgress$ | async"
 			text="Senden"
 			icon="send"
 			type="submit"
 			class="submit-button">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 
 		<alfa-postfach-nachricht-reply-editor-container></alfa-postfach-nachricht-reply-editor-container>
 	</div>
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-nachricht-reply-editor-container/postfach-nachricht-reply-editor-container.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-nachricht-reply-editor-container/postfach-nachricht-reply-editor-container.component.html
index 35c63b665bff5a0f91c691b0943fccb4328e5536..26472767b9aa2f0dd9b3b3e99dd2821014697088 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-nachricht-reply-editor-container/postfach-nachricht-reply-editor-container.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-nachricht-reply-editor-container/postfach-nachricht-reply-editor-container.component.html
@@ -1,9 +1,9 @@
 <ng-container *ngIf="postfachFeatures$ | async as postfachFeatures">
 
-	<alfa-enum-editor *ngIf="postfachFeatures.reply" data-test-id="postfach-reply-option"
+	<ozgcloud-enum-editor *ngIf="postfachFeatures.reply" data-test-id="postfach-reply-option"
 		[formControlName]="formServiceClass.FIELD_REPLY_OPTION"
 		[defaultItem]="defaultItem"
 		[itemList]="itemList">
-	</alfa-enum-editor>
+	</ozgcloud-enum-editor>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
index a96a01025bebb6b7b5fcb242ec0d9a58e06727f7..f3cb419aea172a6c922d89ef31231b06dce01ad7 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
@@ -31,7 +31,7 @@
 	</ng-container>
 </div>
 
-<alfa-spinner [stateResource]="postfachMailListStateResource">
+<ozgcloud-spinner [stateResource]="postfachMailListStateResource">
 
 	<alfa-postfach-mail *ngFor="let postfachMail of postfachMailListStateResource.resource | toEmbeddedResources: postfachMailListLinkRel.POSTFACH_MAIL_LIST"
 		class="postfach"
@@ -39,7 +39,7 @@
 		[postfachMail]="postfachMail"
 		[attr.data-test-id]="(postfachMail.subject | convertForDataTest) + '-item'">
 	</alfa-postfach-mail>
-</alfa-spinner>
+</ozgcloud-spinner>
 
 <ng-container *ngIf="postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL; else noPostfach">
 	<alfa-postfach-mail-button-container text="Nachricht" [vorgang]="vorgangStateResource.resource" data-test-id="postfach-mail-button-container"></alfa-postfach-mail-button-container>
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
index 3bfad54d2fb6faf6a92743ec70afa975e3887077..1f474e48d20612b3006277687c80efcc0882e2da 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.html
@@ -28,10 +28,10 @@
 	<mat-icon data-test-id="mail-send-error-icon" class="mail-send-error__icon mat-icon-error">error_outline_white</mat-icon>
 </div>
 <!-- TODO Eigene Component fuer den Button -->
-<alfa-ozgcloud-stroked-button-with-spinner dataTestId="mail-resend-button"
+<ozgcloud-stroked-button-with-spinner dataTestId="mail-resend-button"
 		text="Erneut versuchen"
 		icon="autorenew"
 		[stateResource]="resendPostfachMailStateResource"
 		(clickEmitter)="resend.emit()">
-</alfa-ozgcloud-stroked-button-with-spinner>
+</ozgcloud-stroked-button-with-spinner>
 <!--  -->
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
index 01997ff0302b055eb7e247f8f60b26a94a1842dc..26a6ba4cebce822a7dd671debd3156d47c59b593 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/outgoing-mail-error-container/outgoing-mail-error/outgoing-mail-error.component.scss
@@ -45,7 +45,7 @@
 	}
 }
 
-alfa-ozgcloud-stroked-button-with-spinner {
+ozgcloud-stroked-button-with-spinner {
 	display: block;
 	margin-bottom: 8px;
 }
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.html
index a9bc1087391597cee071887691542eaac5af3c52..fe8c945fbdb7fd0f2fdfea3da8a60640a083d601 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.html
@@ -1 +1 @@
-<alfa-ozgcloud-icon data-test-id="postfach-nachricht-edit-button" icon="edit" (click)="edit()">Bearbeiten</alfa-ozgcloud-icon>
\ No newline at end of file
+<ozgcloud-icon data-test-id="postfach-nachricht-edit-button" icon="edit" (click)="edit()">Bearbeiten</ozgcloud-icon>
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.scss b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.scss
index f8693138f476d88c41f8e9a1e706139e401d19c3..59f95bf4f805c1b62d0fc3065a1ec0ae84a0c299 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.scss
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/outgoing-mail/postfach-nachricht-edit-button-container/postfach-nachricht-edit-button-container.component.scss
@@ -3,7 +3,7 @@
 	cursor: pointer;
 
 	// TODO Do not use ::ng-deep because it's marked as deprecated.
-	::ng-deep alfa-ozgcloud-icon {
+	::ng-deep ozgcloud-icon {
 		mat-icon {
 			vertical-align: initial;
 		}
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button/postfach-mail-pdf-button.component.html b/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button/postfach-mail-pdf-button.component.html
index ba76ceac4ceff6d55cc5eb2832faf583f8a2ecfd..ba19cb8fdb7b9ceacd92608f2b705a638fa61438 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button/postfach-mail-pdf-button.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button/postfach-mail-pdf-button.component.html
@@ -26,20 +26,20 @@
 <ng-container *ngIf="postfachMailCount != postfachNachrichtenCount.NONE">
 
 	<ng-container *ngIf="showButtonWithLabel; else showButton">
-		<alfa-ozgcloud-stroked-button-with-spinner data-test-id="postfach-pdf-export-button"
+		<ozgcloud-stroked-button-with-spinner data-test-id="postfach-pdf-export-button"
 			[showSpinner]="isDownloadInProgress"
 			svgIcon="pdf_export"
 			[text]="label" [toolTip]="label"
 			(clickEmitter)="downloadPdf.emit()">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 	</ng-container>
 	<ng-template #showButton>
-		<alfa-ozgcloud-stroked-button-with-spinner data-test-id="postfach-pdf-export-label-button"
+		<ozgcloud-stroked-button-with-spinner data-test-id="postfach-pdf-export-label-button"
 			[showSpinner]="isDownloadInProgress"
 			svgIcon="pdf_export"
 			[toolTip]="label"
 			(clickEmitter)="downloadPdf.emit()">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 	</ng-template>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page-mail-list/postfach-page-mail-list.component.html b/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page-mail-list/postfach-page-mail-list.component.html
index f85a72a2384a3498d082a591aceca9fabce0d7e0..9ac408afd4df6494ab4676a2c14ec72cfd9a9f93 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page-mail-list/postfach-page-mail-list.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page-mail-list/postfach-page-mail-list.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner *ngIf="postfachMailListStateResource">
+<ozgcloud-spinner *ngIf="postfachMailListStateResource">
 
 	<alfa-postfach-mail *ngFor="let postfachMail of postfachMailListStateResource.resource | toEmbeddedResources: postfachMailListLinkRel.POSTFACH_MAIL_LIST" [attr.data-test-id]="(postfachMail.subject | convertForDataTest) + '-item'"
 		class="postfach postfach-links-disabled"
@@ -35,4 +35,4 @@
 		[postfachMailListResource]="postfachMailListStateResource.resource">
 	</alfa-postfach-mail-pdf-button-container>
 
-</alfa-spinner>
+</ozgcloud-spinner>
diff --git a/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html b/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
index 23e5986fc6d9969453afd4fa56ae2434492ca4e8..8b22869438759fa498839fb4addfe9cfb2dd3356 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
+++ b/goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
@@ -23,9 +23,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-subnavigation class="mat-app-background">
-	<alfa-back-button linkTo="../" label="zurück zur Detailseite"></alfa-back-button>
-</alfa-subnavigation>
+<ozgcloud-subnavigation class="mat-app-background">
+	<ozgcloud-back-button linkTo="../" label="zurück zur Detailseite"></ozgcloud-back-button>
+</ozgcloud-subnavigation>
 
 <div class="l-scroll-area--full">
 	<alfa-vorgang-in-postfach-breadcrumb-container></alfa-vorgang-in-postfach-breadcrumb-container>
diff --git a/goofy-client/libs/ui/src/lib/icon/app-icon/app-icon.component.ts b/goofy-client/libs/ui/src/lib/icon/app-icon/app-icon.component.ts
index 2a9b5d59e0dc428323ddb7f2506d1415450833d1..d2d6ced7dfdfe0164d4b076ac98c4a91f281fdfa 100644
--- a/goofy-client/libs/ui/src/lib/icon/app-icon/app-icon.component.ts
+++ b/goofy-client/libs/ui/src/lib/icon/app-icon/app-icon.component.ts
@@ -24,7 +24,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-	selector: 'alfa-app-icon',
+	selector: 'ozgcloud-app-icon',
 	templateUrl: './app-icon.component.html',
 	styleUrls: ['./app-icon.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/icon/postfach-icon/_postfach-icon.component.theme.scss b/goofy-client/libs/ui/src/lib/icon/postfach-icon/_postfach-icon.component.theme.scss
index 5aa4030aee108b79aac8bc16aae714dd1040b416..b83fefec3c9a2815702b84095983872308175a94 100644
--- a/goofy-client/libs/ui/src/lib/icon/postfach-icon/_postfach-icon.component.theme.scss
+++ b/goofy-client/libs/ui/src/lib/icon/postfach-icon/_postfach-icon.component.theme.scss
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-alfa-postfach-icon {
+ozgcloud-postfach-icon {
 	.mat-badge-small.mat-badge-above .mat-badge-content {
 		top: -3px;
 	}
diff --git a/goofy-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts b/goofy-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts
index 8efa754746142ab78afcb22e1ace6449847abaa1..0bc56357ee24c4d6320bc116e6b74e8c614131b2 100644
--- a/goofy-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts
+++ b/goofy-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.ts
@@ -24,7 +24,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-postfach-icon',
+	selector: 'ozgcloud-postfach-icon',
 	templateUrl: './postfach-icon.component.html',
 	styleUrls: ['./postfach-icon.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.ts
index 8af488150eec8bbea33bba73322b1948710e3dd8..433f320a8b966c7b7d727a5ea4ab6e22312c5821 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.ts
@@ -24,7 +24,7 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 
 @Component({
-	selector: 'alfa-snackbar-close-button',
+	selector: 'ozgcloud-snackbar-close-button',
 	templateUrl: './snackbar-close-button.component.html',
 	styleUrls: ['./snackbar-close-button.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.html b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.html
index 07e76425d143efc1765f3745ac9286485a056ad5..c40c7e851234474b13808b0d24040ddfa7f8d9c2 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.html
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.html
@@ -25,4 +25,4 @@
 -->
 <div data-test-id="snackbar-message" class="message">{{ message }}</div>
 
-<alfa-snackbar-close-button (close)="close()"></alfa-snackbar-close-button>
+<ozgcloud-snackbar-close-button (close)="close()"></ozgcloud-snackbar-close-button>
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
index 6e2381e8e6c472b178234c3c891146ae4199812a..5c8770b7367a506f0324e21a8fcdced8ee2932e8 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
@@ -26,7 +26,7 @@ import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'
 import { SnackBarData } from '../snackbar.model';
 
 @Component({
-	selector: 'alfa-snackbar-error',
+	selector: 'ozgcloud-snackbar-error',
 	templateUrl: './snackbar-error.component.html',
 	styleUrls: ['./snackbar-error.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.html b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.html
index 0d16f8f401306db7b9be6f9437cbab10c31a74d8..d5d894573d947f46d111503a974ee65a3824ed03 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.html
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.html
@@ -32,4 +32,4 @@
 	Rückgängig
 </button>
 
-<alfa-snackbar-close-button (close)="close()"></alfa-snackbar-close-button>
\ No newline at end of file
+<ozgcloud-snackbar-close-button (close)="close()"></ozgcloud-snackbar-close-button>
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
index 930d9afaad77ca967bed192dadb4351bd27918a6..083ff10b1249dd8bcce98b2633dc9a22912af477 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
@@ -28,7 +28,7 @@ import { isUndefined } from 'lodash-es';
 import { SnackBarData } from '../snackbar.model';
 
 @Component({
-	selector: 'alfa-snackbar-info',
+	selector: 'ozgcloud-snackbar-info',
 	templateUrl: './snackbar-info.component.html',
 	styleUrls: ['./snackbar-info.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/accordion/accordion.component.ts b/goofy-client/libs/ui/src/lib/ui/accordion/accordion.component.ts
index 4c3717249bf93a42b31af5c6ffd403b071f25a26..65349355f994ec36eac30ad6e874251a5b3d32d3 100644
--- a/goofy-client/libs/ui/src/lib/ui/accordion/accordion.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/accordion/accordion.component.ts
@@ -24,7 +24,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-accordion',
+	selector: 'ozgcloud-accordion',
 	templateUrl: './accordion.component.html',
 	styleUrls: ['./accordion.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/back-button/back-button.component.ts b/goofy-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
index e984fb94bc00c7ed5bc412544d58f37273712982..6a1d338d5c114a8e072aec67ec524c73f33274c8 100644
--- a/goofy-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-back-button',
+	selector: 'ozgcloud-back-button',
 	templateUrl: './back-button.component.html',
 	styleUrls: ['./back-button.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.html b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.html
index 6283df6d8ee8b4ad874bc6f7df3d475a9dc94ed3..a90044aa60aa1d1710f461973d4b765892811016 100644
--- a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.html
@@ -3,17 +3,17 @@
 	<p data-test-id="dialog-message">{{ data.message }}</p>
 </div>
 <div mat-dialog-actions>
-	<alfa-ozgcloud-stroked-button-with-spinner
+	<ozgcloud-stroked-button-with-spinner
 		dataTestId="dialog-confirmation-button"
 		[mat-dialog-close]="true"
 		svgIcon="{{ data.okSvgIcon }}"
 		text="{{ data.okText }}">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-ozgcloud-stroked-button-with-spinner
+	<ozgcloud-stroked-button-with-spinner
 		dataTestId="dialog-cancel-button"
 		(click)="onNoClick()"
 		text="Abbrechen">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
 </div>
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.scss b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.scss
index 6340c487354a000d9fb35563c602911e2cd4cd29..6cb84a4770ab1b41fe6e94d95e35091f5c9a5201 100644
--- a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.scss
@@ -7,6 +7,6 @@ button, h1 {
 	color: mat.get-color-from-palette($primaryPalette);
 }
 
-alfa-ozgcloud-stroked-button-with-spinner {
+ozgcloud-stroked-button-with-spinner {
 	margin-left: 1rem;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.ts
index 3d519b951283edc2e379e8fcdc0384b4b7f6db58..625b40e90374571ab8fab25fccf5b0db376d917b 100644
--- a/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/basic-dialog/basic-dialog.component.ts
@@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { BasicDialogData } from './basic-dialog-data.model';
 
 @Component({
-	selector: 'alfa-basic-dialog',
+	selector: 'ozgcloud-basic-dialog',
 	templateUrl: './basic-dialog.component.html',
 	styleUrls: ['./basic-dialog.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.ts b/goofy-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.ts
index 62b3cd9d9a25b642e2ea397ae3d945c360727995..de2c4eba10350ef8756ae32c32a4fa0da11d28f0 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.ts
@@ -3,7 +3,7 @@ import { MatButtonToggleGroup } from '@angular/material/button-toggle';
 import { ButtonToggleComponent } from '../button-toggle/button-toggle.component';
 
 @Component({
-	selector: 'alfa-button-toggle-group',
+	selector: 'ozgcloud-button-toggle-group',
 	templateUrl: './button-toggle-group.component.html',
 	styleUrls: ['./button-toggle-group.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/button-toggle/_button-toogle.theme.scss b/goofy-client/libs/ui/src/lib/ui/button-toggle/_button-toogle.theme.scss
index 620bfb0b592373ba44bd34e72b8d34d39454a386..7afd0fa5ce394316ad28695e578889a490b2293d 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-toggle/_button-toogle.theme.scss
+++ b/goofy-client/libs/ui/src/lib/ui/button-toggle/_button-toogle.theme.scss
@@ -1,4 +1,4 @@
-alfa-button-toggle {
+ozgcloud-button-toggle {
 	.mat-button-toggle-standalone.mat-button-toggle-appearance-standard,
 	.mat-button-toggle-appearance-standard {
 		border-radius: 20px;
diff --git a/goofy-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.ts b/goofy-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.ts
index e3821a6926b3247a5cf24ec5fb1766e9ac1160b9..136adf953ae31184212ecef6b87febb5f0e433b7 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { MatButtonToggle, MatButtonToggleGroup } from '@angular/material/button-toggle';
 
 @Component({
-	selector: 'alfa-button-toggle',
+	selector: 'ozgcloud-button-toggle',
 	templateUrl: './button-toggle.component.html',
 	styleUrls: ['./button-toggle.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/download-button/download-button.component.ts b/goofy-client/libs/ui/src/lib/ui/download-button/download-button.component.ts
index 6ee431e062bae235dde72aeb22c7623d9f1a0d5e..faea193711d590c3364573b70677a87e972b02fa 100644
--- a/goofy-client/libs/ui/src/lib/ui/download-button/download-button.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/download-button/download-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-download-button',
+	selector: 'ozgcloud-download-button',
 	templateUrl: './download-button.component.html',
 	styleUrls: ['./download-button.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.html
index 09da06e2602a9cfec7a2ad6180e42652d59c88c4..05b5f5532de6fc5069b6cfd10e008e4e0c1f0769 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.html
@@ -41,10 +41,10 @@
 	</mat-autocomplete>
 
 	<mat-error>
-		<alfa-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-autocomplete-error'"
+		<ozgcloud-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-autocomplete-error'"
 				[issues]="issues"
 				[label]="label">
-		</alfa-validation-error>
+		</ozgcloud-validation-error>
 	</mat-error>
 
 </mat-form-field>
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.ts
index bc9790fd6edd5562b2b2372da2a7bdc0ca0d7e4a..ec7d991895cbc6340590f2f260c9431829fba535 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.ts
@@ -27,7 +27,7 @@ import { isEmpty, isEqual, isNil } from 'lodash-es';
 import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
-	selector: 'alfa-autocomplete-editor',
+	selector: 'ozgcloud-autocomplete-editor',
 	templateUrl: './autocomplete-editor.component.html',
 	styleUrls: ['./autocomplete-editor.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
index 57852f0f371c913b56dd3c76eedd45e11dd1fa63..8997db3c5cd31ed694c3f492b18c8611367346b7 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
@@ -34,6 +34,6 @@
 	<mat-datepicker #picker></mat-datepicker>
 
 	<mat-error>
-		<alfa-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-date-error'" [issues]="issues" [label]="label"></alfa-validation-error>
+		<ozgcloud-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-date-error'" [issues]="issues" [label]="label"></ozgcloud-validation-error>
 	</mat-error>
 </mat-form-field>
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
index 73ccc83bd7124cca99726acb4cb2590d13273164..2781658b22ea62aed6a192c5e972e543f1934647 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
@@ -26,7 +26,7 @@ import { MatDatepickerInputEvent } from '@angular/material/datepicker';
 import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
-	selector: 'alfa-date-editor',
+	selector: 'ozgcloud-date-editor',
 	templateUrl: './date-editor.component.html',
 	styleUrls: ['./date-editor.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
index 8071f1c5a3b9daeb3291a8b3f73644e18e501bfd..84c93470aebf751c0df5ee4c23fa4604802baf11 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
@@ -23,15 +23,15 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-icon-button-with-spinner
+<ozgcloud-icon-button-with-spinner
 		[icon]="selectedItem.icon"
 		[svgIcon]="selectedItem.svgIcon"
 		[matMenuTriggerFor]="menu.matMenu"
 		toolTip="Antworten erlauben/unterbinden"
 		class="reply-toggle">
-</alfa-icon-button-with-spinner>
+</ozgcloud-icon-button-with-spinner>
 
-<alfa-ozgcloud-menu #menu class="reply-option-menu">
+<ozgcloud-menu #menu class="reply-option-menu">
 	<button *ngFor="let item of itemList;"
 			mat-menu-item
 			(click)="setSelectedEnumItem(item)"
@@ -41,7 +41,7 @@
 		<mat-icon *ngIf="!item.svgIcon">{{ item.icon }}</mat-icon>
 		<span> {{ item.text }}</span>
 	</button>
-</alfa-ozgcloud-menu>
+</ozgcloud-menu>
 
 <mat-label>{{ label }}</mat-label>
 <input [formControl]="fieldControl" [attr.data-test-id]="(label | convertForDataTest) + '-enum-input'"
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.ts
index 83d8ccc61c357f8965479834f495e849ac3545bc..df5c8393e33119843a54555486e0d1fce2ec7fa0 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.ts
@@ -26,7 +26,7 @@ import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstra
 import { EnumEditorItem } from './enum-editor.model';
 
 @Component({
-	selector: 'alfa-enum-editor',
+	selector: 'ozgcloud-enum-editor',
 	templateUrl: './enum-editor.component.html',
 	styleUrls: ['./enum-editor.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.html
index 42f83671bec4603081fd8c7562497f6088b6ad8d..2d8b704ed35e895f15b9e1e446a61911bc0c2fb3 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.html
@@ -34,11 +34,11 @@
 <label [attr.for]="uploadFileId" matRipple [attr.aria-label]="label">
 	<mat-icon *ngIf="!uploadInProgress.loading">attach_file</mat-icon>
 
-	<alfa-spinner [stateResource]="uploadInProgress" [diameter]="22" padding="0"> </alfa-spinner>
+	<ozgcloud-spinner [stateResource]="uploadInProgress" [diameter]="22" padding="0"> </ozgcloud-spinner>
 </label>
 
 <mat-error>
-	<alfa-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-file-upload-error'"
+	<ozgcloud-validation-error [attr.data-test-id]="(label | convertForDataTest) + '-file-upload-error'"
 		[issues]="issues" [label]="label">
-	</alfa-validation-error>
+	</ozgcloud-validation-error>
 </mat-error>
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.scss b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.scss
index fa74749bf7c505e7d3ed22fdb0aa7b36ce1c18ec..eb99fb673cfd4315e47aa9b930393d28647136e7 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.scss
@@ -56,7 +56,7 @@ label:hover,
 	background-color: rgba(#000, 0.08);
 }
 
-alfa-spinner {
+ozgcloud-spinner {
 	position: absolute;
 	top: 0;
 	left: 0;
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.ts
index 0742d8b29ed8e644b93c8abdeda14c350b4ccb62..de16a7d41ec924bc92aa1448e8bead20aac5ee24 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.ts
@@ -28,7 +28,7 @@ import { uniqueId } from 'lodash-es';
 import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
-	selector: 'alfa-file-upload-editor',
+	selector: 'ozgcloud-file-upload-editor',
 	templateUrl: './file-upload-editor.component.html',
 	styleUrls: ['./file-upload-editor.component.scss'],
 	viewProviders: [{ provide: ControlContainer, useExisting: FormGroupDirective }],
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html
index ce9e2872b95ada6f5b6ead2cc5f474321f7aa1c1..ae13f2b9708fb4ac763fc1df32ca67313a5da179 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html
@@ -35,7 +35,7 @@
 			[attr.data-test-id]="(label | convertForDataTest) + '-text-input'"/>
 
 	<mat-error>
-		<alfa-validation-error [attr.data-test-id]="(getPlaceholderLabel() | convertForDataTest) + '-text-error'" [issues]="issues"
-				[label]="getPlaceholderLabel()"></alfa-validation-error>
+		<ozgcloud-validation-error [attr.data-test-id]="(getPlaceholderLabel() | convertForDataTest) + '-text-error'" [issues]="issues"
+				[label]="getPlaceholderLabel()"></ozgcloud-validation-error>
 	</mat-error>
 </mat-form-field>
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
index b1fae418b5a0fc67a43d2562fa6e130aee2b1857..fb5e25c1bf0c6952b72ef28ae9b2de5e5af66e0f 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
@@ -25,7 +25,7 @@ import { AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular
 import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
-	selector: 'alfa-text-editor',
+	selector: 'ozgcloud-text-editor',
 	templateUrl: './text-editor.component.html',
 	styleUrls: ['./text-editor.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html
index 57420629054c18092447d7f9a7281da07dd96889..a9836e9c3fa47a7bcaf12338d80fd5db06f80c0f 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html
@@ -38,11 +38,11 @@
 	</textarea>
 
 	<mat-error>
-		<alfa-validation-error
+		<ozgcloud-validation-error
 				[issues]="issues"
 				[label]="label"
 				[attr.data-test-id]="(label | convertForDataTest) + '-textarea-error'">
-		</alfa-validation-error>
+		</ozgcloud-validation-error>
 	</mat-error>
 
 </mat-form-field>
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
index 277b394d42628d69f5834a3fa2a1f3a99193f8e0..15857c48888918e5f8da9ba86b8ebf6f696dd5f3 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
@@ -26,7 +26,7 @@ import { AfterViewInit, Component, Input, ViewChild } from '@angular/core';
 import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
-	selector: 'alfa-textarea-editor',
+	selector: 'ozgcloud-textarea-editor',
 	templateUrl: './textarea-editor.component.html',
 	styleUrls: ['./textarea-editor.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss b/goofy-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
index 4e252b7ceac215b288c4745e15fde6453edc37d3..ff11a3e36b4e2126661ea432197274e5b374eea8 100644
--- a/goofy-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
+++ b/goofy-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
@@ -28,13 +28,13 @@
 	$color-config: mat.get-color-config($theme);
 	$primary-palette: map.get($color-config, 'primary');
 
-	alfa-expansion-panel h3 {
+	ozgcloud-expansion-panel h3 {
 		color: mat.get-color-from-palette($primary-palette);
 	}
 }
 
 
-body.mat-typography alfa-expansion-panel {
+body.mat-typography ozgcloud-expansion-panel {
 	.mat-expansion-panel-header {
 		padding: 0 !important;
 		height: 44px !important;
@@ -51,7 +51,7 @@ body.mat-typography alfa-expansion-panel {
 		padding: 0 0 16px 56px;
 	}
 
-	alfa-expansion-panel {
+	ozgcloud-expansion-panel {
 		.mat-expansion-panel-header {
 			height: 40px !important;
 		}
@@ -74,7 +74,7 @@ body.mat-typography alfa-expansion-panel {
 	}
 }
 
-body.mat-typography alfa-expansion-panel-with-user {
+body.mat-typography ozgcloud-expansion-panel-with-user {
 	.mat-expansion-panel-body {
 		padding: 0 0 0 32px;
 	}
@@ -86,7 +86,7 @@ body.mat-typography alfa-expansion-panel-with-user {
 	}
 }
 
-.dark alfa-expansion-panel {
+.dark ozgcloud-expansion-panel {
 	h3 {
 		color: mat.get-color-from-palette($primaryPalette, lighter);
 	}
diff --git a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
index ea1a51f7ae9a072c2251a614793d162cfcd394b9..addd753088e354e24e08034a85414ec554e448a3 100644
--- a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
@@ -24,7 +24,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-expansion-panel',
+	selector: 'ozgcloud-expansion-panel',
 	templateUrl: './expansion-panel.component.html',
 	styleUrls: ['./expansion-panel.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
index a6ab4471622bc64dc2aedbde809a41e7967c8a70..7c7d499ebe09ffc4cf51a7a1fa658ac987177275 100644
--- a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
@@ -30,10 +30,10 @@
 	<label [attr.for]="myId" matRipple aria-label="Anhang hinzufügen">
 		<mat-icon *ngIf="!uploadInProgress.loading">attach_file</mat-icon>
 
-		<alfa-spinner
+		<ozgcloud-spinner
 				[stateResource]="uploadInProgress"
 				[diameter]="22"
 				padding="0">
-		</alfa-spinner>
+		</ozgcloud-spinner>
 	</label>
 </ng-container>
diff --git a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.scss b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.scss
index fa74749bf7c505e7d3ed22fdb0aa7b36ce1c18ec..eb99fb673cfd4315e47aa9b930393d28647136e7 100644
--- a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.scss
@@ -56,7 +56,7 @@ label:hover,
 	background-color: rgba(#000, 0.08);
 }
 
-alfa-spinner {
+ozgcloud-spinner {
 	position: absolute;
 	top: 0;
 	left: 0;
diff --git a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.ts b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.ts
index 1cb84efd73f3a2e270295fc7de3a9b1d73f39db6..9b0ea54ce095d8f7b88326519a32266cc3c675eb 100644
--- a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.ts
@@ -27,7 +27,7 @@ import { uniqueId } from 'lodash-es';
 import { Observable } from 'rxjs';
 
 @Component({
-	selector: 'alfa-file-upload',
+	selector: 'ozgcloud-file-upload',
 	templateUrl: './file-upload.component.html',
 	styleUrls: ['./file-upload.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
index 9ca26d43c444c20848b921e80443863d7137f434..c28044caff7e8080559a3537e24c07b7efaa494e 100644
--- a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
@@ -27,7 +27,7 @@ import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 import { FixedDialogData } from './fixed-dialog-data.model';
 
 @Component({
-	selector: 'alfa-fixed-dialog',
+	selector: 'ozgcloud-fixed-dialog',
 	templateUrl: './fixed-dialog.component.html'
 })
 export class FixedDialogComponent {
diff --git a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.ts
index c8242cc2f74650e2798e96db20d16afbb62d868a..d405cc627305f4b3d3ec9280017c4e2065cdf948 100644
--- a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.ts
@@ -24,7 +24,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-	selector: 'alfa-connection-timeout-retry-dialog',
+	selector: 'ozgcloud-connection-timeout-retry-dialog',
 	templateUrl: './connection-timeout-retry-dialog.component.html',
 	styleUrls: ['./connection-timeout-retry-dialog.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.html b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.html
index 532ea525c6fbb53be871556d01120622b5534f50..7085599b3a10a892ad5b88b41c258ed8916afdfe 100644
--- a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.html
@@ -33,8 +33,8 @@
 			Auch nach weiteren Versuchen konnte keine Verbindung aufgebaut werden. <br />
 			Bitte wenden Sie sich an Ihren Administrator.
 		</p>
-		<alfa-ozgcloud-stroked-button-with-spinner tabindex="-1" class="button" icon="refresh" text="Reload" data-test-id="reload-button"
+		<ozgcloud-stroked-button-with-spinner tabindex="-1" class="button" icon="refresh" text="Reload" data-test-id="reload-button"
 			(click)="reload()">
-		</alfa-ozgcloud-stroked-button-with-spinner>
+		</ozgcloud-stroked-button-with-spinner>
 	</mat-dialog-content>
 </div>
diff --git a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.ts
index 8bc10d629405131f61c08e65bb0fcaeeec82fa22..5ddb7e66fa59e47b21497b664103f667ebce70e2 100644
--- a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.ts
@@ -24,7 +24,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-	selector: 'alfa-connection-timeout-retry-fail-dialog',
+	selector: 'ozgcloud-connection-timeout-retry-fail-dialog',
 	templateUrl: './connection-timeout-retry-fail-dialog.component.html',
 	styleUrls: ['./connection-timeout-retry-fail-dialog.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
index 185c1f85816587583404c85db7798368bceebffa..7700059b1e5e19ca90885225e89865dabdb70176 100644
--- a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
@@ -40,10 +40,10 @@
 			[style.visibility]="isDisabled ? 'hidden' : 'visible'">
 	</mat-icon>
 
-	<alfa-spinner
+	<ozgcloud-spinner
 		[stateResource]="getStateResource()" [diameter]="22"
 		[show]="showSpinner"
 		padding="0">
-	</alfa-spinner>
+	</ozgcloud-spinner>
 
 </button>
diff --git a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.scss b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.scss
index 395e336ca4281e63ccbc2430f930ec5784bd0f9e..a69744885ec768c7a76e82dd0be1a96c6eb299f2 100644
--- a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.scss
@@ -29,7 +29,7 @@
 	background-color: rgba(#000, 0.08);
 }
 
-alfa-spinner {
+ozgcloud-spinner {
 	position: absolute;
 	top: 0;
 	left: 0;
diff --git a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.ts b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.ts
index 8d30c4e6710074e8133e2b0d7094e68bf6c5a789..24c155b0f5be6be9ab85c9875a8be49bfda82405 100644
--- a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.ts
@@ -27,7 +27,7 @@ import { Resource } from '@ngxp/rest';
 import { isNil } from 'lodash-es';
 
 @Component({
-	selector: 'alfa-icon-button-with-spinner',
+	selector: 'ozgcloud-icon-button-with-spinner',
 	templateUrl: './icon-button-with-spinner.component.html',
 	styleUrls: ['./icon-button-with-spinner.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.html b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.html
index dfbacae8957574a77bd3f1cc666c3c11bf42f1a8..c4f56f748c42f39ff147652ceadab53dd39ba14a 100644
--- a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.html
@@ -1,8 +1,8 @@
 <ng-container *ngIf="iconSizeBig, else standardSize">
-	<alfa-ozgcloud-svgicon-big [svgIcon]="icon"></alfa-ozgcloud-svgicon-big>
+	<ozgcloud-svgicon-big [svgIcon]="icon"></ozgcloud-svgicon-big>
 </ng-container>
 <ng-template #standardSize>
-	<alfa-ozgcloud-svgicon [svgIcon]="icon"></alfa-ozgcloud-svgicon>
+	<ozgcloud-svgicon [svgIcon]="icon"></ozgcloud-svgicon>
 </ng-template>
 
 <div>
diff --git a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.scss b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.scss
index ceb563e701c95b4dcfcc7743c2128825a409d9cf..0f391c61c9c487c0ac09b43faf8e7048b3d5fc67 100644
--- a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.scss
@@ -10,8 +10,8 @@ $menuItemBorder: 1px solid #eeeeee;
 	border-bottom: $menuItemBorder;
 }
 
-alfa-ozgcloud-svgicon,
-alfa-ozgcloud-svgicon-big {
+ozgcloud-svgicon,
+ozgcloud-svgicon-big {
 	margin-right: 1rem;
 }
 
diff --git a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.ts b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.ts
index 5039e60b627afefda1e86cf53adc7bb329f78727..f14bc644aecabe1ba0ad957582c28a9513b449b3 100644
--- a/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/menu-item/menu-item.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-menu-item',
+	selector: 'ozgcloud-menu-item',
 	templateUrl: './menu-item.component.html',
 	styleUrls: ['./menu-item.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
index 9e27263b2222d024d68e6cff0d40f1f072e82e14..c539d1e9c542e0c4eb3156a68ed660ca2afe0119 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
@@ -32,9 +32,9 @@
 		Wir sind nicht ganz sicher, was schiefgelaufen ist. Der Fehler <span *ngIf="showId()">(ID: {{ data.issues[0].exceptionId }})</span> wurde unserem Support gemeldet. Bitte starten sie die Anwendung neu.
 	</p>
 	<a href="/" tabindex="-1" class="button">
-		<alfa-ozgcloud-stroked-button-with-spinner icon="refresh" text="Neu starten"></alfa-ozgcloud-stroked-button-with-spinner>
+		<ozgcloud-stroked-button-with-spinner icon="refresh" text="Neu starten"></ozgcloud-stroked-button-with-spinner>
 	</a>
-	<alfa-ozgcloud-stroked-button-with-spinner icon="logout" text="Abmelden" data-test-id="logout-button"
+	<ozgcloud-stroked-button-with-spinner icon="logout" text="Abmelden" data-test-id="logout-button"
 		(clickEmitter)="authService.logOut()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 </mat-dialog-content>
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
index 7ad58e2e57a6f88460625eb9d3b6a1afe5169de0..39b24e2a09413f035e00b843132472584249d8f6 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
@@ -27,7 +27,7 @@ import { ApiError, hasExceptionId } from '@alfa-client/tech-shared';
 import { OAuthService } from 'angular-oauth2-oidc';
 
 @Component({
-	selector: 'alfa-internal-server-error-dialog',
+	selector: 'ozgcloud-internal-server-error-dialog',
 	templateUrl: './internal-server-error-dialog.component.html',
 	styleUrls: ['./internal-server-error-dialog.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/open-url-button/open-url-button.component.ts b/goofy-client/libs/ui/src/lib/ui/open-url-button/open-url-button.component.ts
index 76dc2c622b7b1223e33f728d87e0a988642d625d..73fd7c5c227a82ce9bc492b280da55a9ca123954 100644
--- a/goofy-client/libs/ui/src/lib/ui/open-url-button/open-url-button.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/open-url-button/open-url-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-open-url-button',
+	selector: 'ozgcloud-open-url-button',
 	templateUrl: './open-url-button.component.html',
 	styleUrls: ['./open-url-button.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.html
index febf57bf202c859697bf6b21b1da1eea6e0ddac2..2c6674510bdb6c79279c5ba924fbbc8d8aded679 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.html
@@ -31,13 +31,13 @@
 		[class.with-text]="text"
 		(click)="clickEmitter.emit($event)">
 
-	<alfa-ozgcloud-button-content
+	<ozgcloud-button-content
 		[icon]="icon"
 		[svgIcon]="svgIcon"
 		[text]="text"
 		[stateResource]="stateResource"
 		[showSpinner]="showSpinner"
 		[isDisabled]="isDisabled"
-	></alfa-ozgcloud-button-content>
+	></ozgcloud-button-content>
 
 </button>
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.ts
index daaee5b38cd69e6c6a191f8a07a584a8cb40e69c..802ed077a31e3b4332c832f931b121af31ca8471 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component.ts
@@ -27,7 +27,7 @@ import { Resource } from '@ngxp/rest';
 import { isNil } from 'lodash-es';
 
 @Component({
-	selector: 'alfa-ozgcloud-button-with-spinner',
+	selector: 'ozgcloud-button-with-spinner',
 	templateUrl: './ozgcloud-button-with-spinner.component.html',
 	styleUrls: ['./ozgcloud-button-with-spinner.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.html
index 3084abd661e4784a87c890573914d4c12b1332f9..15328b6c0e37c960cd29faf3b9ba3d5b49ccff52 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.html
@@ -31,13 +31,13 @@
 		[class.with-text]="text"
 		(click)="clickEmitter.emit($event)">
 
-	<alfa-ozgcloud-button-content
+	<ozgcloud-button-content
 		[icon]="icon"
 		[svgIcon]="svgIcon"
 		[text]="text"
 		[stateResource]="stateResource"
 		[showSpinner]="showSpinner"
 		[isDisabled]="isDisabled"
-	></alfa-ozgcloud-button-content>
+	></ozgcloud-button-content>
 
 </button>
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.ts
index 785ef51efce8648ff4e24cb1ed5327f47583de14..1d6b8671f01db449127ad8e7cdc288272308af96 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component.ts
@@ -27,7 +27,7 @@ import { Resource } from '@ngxp/rest';
 import { isNil } from 'lodash-es';
 
 @Component({
-	selector: 'alfa-ozgcloud-stroked-button-with-spinner',
+	selector: 'ozgcloud-stroked-button-with-spinner',
 	templateUrl: './ozgcloud-stroked-button-with-spinner.component.html',
 	styleUrls: ['./ozgcloud-stroked-button-with-spinner.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
index eb9ca74e2264ef9749f4e6a43f77d67e42cb9368..ac82f2c90bd277444dcb8bca6adada7dd5d2d4c4 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
@@ -10,8 +10,8 @@
 
 <span *ngIf="text" data-test-class="button-with-spinner-text">{{ text }}</span>
 
-<alfa-spinner
+<ozgcloud-spinner
 		[diameter]="22" padding="0"
 		[stateResource]="stateResource"
 		[show]="showSpinner">
-</alfa-spinner>
\ No newline at end of file
+</ozgcloud-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
index 8f70e5d709db0bf2e3a54178f16faa0564a9bc76..39af0c8e9b43e341550fb49943b6db954b4a6e2f 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
@@ -10,7 +10,7 @@ span {
 	margin-left: $leftMargin;
 }
 
-alfa-spinner {
+ozgcloud-spinner {
 	position: absolute;
 	top: 0;
 	display: flex;
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.ts
index 4c81c3c31c357e2f997bba526752fd35b51da4e5..9ef4f088e5248f2170cd011e4eedb1a885852619 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.ts
@@ -3,7 +3,7 @@ import { StateResource } from '@alfa-client/tech-shared';
 import { Resource } from '@ngxp/rest';
 
 @Component({
-	selector: 'alfa-ozgcloud-button-content',
+	selector: 'ozgcloud-button-content',
 	templateUrl: './ozgcloud-button-content.component.html',
 	styleUrls: ['./ozgcloud-button-content.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.ts
index bef760ff6188cc1ef5084a87c8c850a8f79eac71..ae5cd032fd99b06625c69f576b7ce38f8fee6cd2 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-ozgcloud-icon',
+	selector: 'ozgcloud-icon',
 	templateUrl: './ozgcloud-icon.component.html',
 	styleUrls: ['./ozgcloud-icon.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-menu/ozgcloud-menu.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-menu/ozgcloud-menu.component.ts
index b7e1d8f1e55017b8a3526f52c5a4abd8249239f2..c2c27f55cd47ae1148b2b265b7cb3d14955f8f17 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-menu/ozgcloud-menu.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-menu/ozgcloud-menu.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core';
 import { MatMenu } from '@angular/material/menu';
 
 @Component({
-	selector: 'alfa-ozgcloud-menu',
+	selector: 'ozgcloud-menu',
 	templateUrl: './ozgcloud-menu.component.html',
 	styleUrls: ['./ozgcloud-menu.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-routing-button/ozgcloud-routing-button.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-routing-button/ozgcloud-routing-button.component.ts
index 9c983f34d2af58e720e811b224ae76aa109544f8..b3ca23af21510dd946bd047337a48eea7edd9d60 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-routing-button/ozgcloud-routing-button.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-routing-button/ozgcloud-routing-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-ozgcloud-routing-button',
+	selector: 'ozgcloud-routing-button',
 	templateUrl: './ozgcloud-routing-button.component.html',
 	styleUrls: ['./ozgcloud-routing-button.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.ts
index d5e9910d954d9ff17c23550c027a10ceaa369fc1..aa1cbe0825ce867a54d807d7b35c207835200e04 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-ozgcloud-svgicon-big',
+	selector: 'ozgcloud-svgicon-big',
 	templateUrl: './ozgcloud-svgicon-big.component.html',
 	styleUrls: ['./ozgcloud-svgicon-big.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.ts b/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.ts
index 6ec20e5debc076b036901150866674b8ef8d05c9..f59052f04474bd2e753f8481ac5e6a11c6527885 100644
--- a/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-	selector: 'alfa-ozgcloud-svgicon',
+	selector: 'ozgcloud-svgicon',
 	templateUrl: './ozgcloud-svgicon.component.html',
 	styleUrls: ['./ozgcloud-svgicon.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
index 0cda5a9552927d0ccb37adb052fcabeed4bdbfec..13e5a563bc447a7c4aa46a026f6f7bcf71fd0591 100644
--- a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
@@ -26,7 +26,7 @@ import { createEmptyStateResource, StateResource } from '@alfa-client/tech-share
 import { Resource } from '@ngxp/rest';
 
 @Component({
-	selector: 'alfa-progress-bar',
+	selector: 'ozgcloud-progress-bar',
 	templateUrl: './progress-bar.component.html',
 	styleUrls: ['./progress-bar.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.ts b/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.ts
index ad8e6c4e847bb99d61bf0baf8799a8e91be82678..59054ccfeee2aeba743b661a8148ed40ea17b2f0 100644
--- a/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.ts
@@ -25,7 +25,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { EMPTY_STRING } from '@alfa-client/tech-shared';
 
 @Component({
-	selector: 'alfa-slide-toggle',
+	selector: 'ozgcloud-slide-toggle',
 	templateUrl: './slide-toggle.component.html',
 	styleUrls: ['./slide-toggle.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.ts b/goofy-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.ts
index 67aaa8fc8e4de217eddb7f375c5e383979069835..12c7d2fb1c4af03a84a07a221eda2fd569d3b283 100644
--- a/goofy-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.ts
@@ -3,7 +3,7 @@ import { StateResource, createEmptyStateResource } from '@alfa-client/tech-share
 import { Resource } from '@ngxp/rest';
 
 @Component({
-	selector: 'alfa-spinner-transparency',
+	selector: 'ozgcloud-spinner-transparency',
 	templateUrl: './spinner-transparency.component.html',
 	styleUrls: ['./spinner-transparency.component.scss'],
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.ts b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.ts
index bdbb17e11f04120ab351eb3ecdab7f20e7ae9822..a7ec921293047d6b3e00ee633383d1c23d8b5b2b 100644
--- a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.ts
@@ -26,7 +26,7 @@ import { createEmptyStateResource, StateResource } from '@alfa-client/tech-share
 import { Resource } from '@ngxp/rest';
 
 @Component({
-	selector: 'alfa-spinner',
+	selector: 'ozgcloud-spinner',
 	templateUrl: './spinner.component.html',
 	styleUrls: ['./spinner.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/subnavigation/subnavigation.component.ts b/goofy-client/libs/ui/src/lib/ui/subnavigation/subnavigation.component.ts
index 62430b633f3c21c9de29fe80c5f411645b4ec12d..0e99b0c95b1d0f0ca715f42666cf1a8f77241783 100644
--- a/goofy-client/libs/ui/src/lib/ui/subnavigation/subnavigation.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/subnavigation/subnavigation.component.ts
@@ -24,7 +24,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'alfa-subnavigation',
+  selector: 'ozgcloud-subnavigation',
   templateUrl: './subnavigation.component.html',
   styleUrls: ['./subnavigation.component.scss']
 })
diff --git a/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts b/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
index 1e91023d51b46db9ec90b6163e49854759cc1a05..985bf3d3c9ca7fe8eda45fd71c44bfca523b7bbb 100644
--- a/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
@@ -25,7 +25,7 @@ import { Component, Input } from '@angular/core';
 import { getMessageForIssue, Issue } from '@alfa-client/tech-shared';
 
 @Component({
-	selector: 'alfa-validation-error',
+	selector: 'ozgcloud-validation-error',
 	templateUrl: './validation-error.component.html',
 	styleUrls: ['./validation-error.component.scss']
 })
diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/dowload-documentation-button/download-documentation-button.component.html b/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/dowload-documentation-button/download-documentation-button.component.html
index 4e336b3dbe7a4f907e9877eadc1c9a3885e97a1b..a3d71444bacff7ff50340baceba09b08e4763809 100644
--- a/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/dowload-documentation-button/download-documentation-button.component.html
+++ b/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/dowload-documentation-button/download-documentation-button.component.html
@@ -1 +1 @@
-<alfa-download-button text="Herunterladen" [url]="url" [targetName]="getFileName()"></alfa-download-button>
\ No newline at end of file
+<ozgcloud-download-button text="Herunterladen" [url]="url" [targetName]="getFileName()"></ozgcloud-download-button>
\ No newline at end of file
diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/open-documentation-button/open-documentation-button.component.html b/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/open-documentation-button/open-documentation-button.component.html
index c1bb0457f1ea8a55e67f83b477bff6780c0861e6..014008e13036e65c16e5e4d900c153d7f417d538 100644
--- a/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/open-documentation-button/open-documentation-button.component.html
+++ b/goofy-client/libs/user-assistance/src/lib/help-menu/documentation/open-documentation-button/open-documentation-button.component.html
@@ -1 +1 @@
-<alfa-open-url-button text="Öffnen" [url]="url" [targetName]="'_blank'" [tooltip]="'Öffnet in einem neuen Tab'"></alfa-open-url-button>
+<ozgcloud-open-url-button text="Öffnen" [url]="url" [targetName]="'_blank'" [tooltip]="'Öffnet in einem neuen Tab'"></ozgcloud-open-url-button>
diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
index e4287621da1457ec5ff8fa2aeed825a9bbcad117..5fa94a4e36efbe94c841b8a15f12412cf699d458 100644
--- a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
+++ b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
@@ -1,11 +1,11 @@
 <button *ngIf="getNumberOfMenuItems() > 0" mat-fab extended [matMenuTriggerFor]="helpMenu.matMenu" data-test-id="help-menu-button">
 	<div class="help-menu">
-		<alfa-ozgcloud-icon icon="help_outline"></alfa-ozgcloud-icon>
+		<ozgcloud-icon icon="help_outline"></ozgcloud-icon>
 		<div class="text">Hilfe</div>
 	</div>
 </button>
-<alfa-ozgcloud-menu #helpMenu>
-	<alfa-menu-item
+<ozgcloud-menu #helpMenu>
+	<ozgcloud-menu-item
 		*ngIf="apiRootStateResource?.resource | hasLink: apiRootLinkRel.DOCUMENTATIONS"
 		headline="Benutzerleitfaden"
 		text="Alle Funktionen der Allgemeinen Fachanwendung (Alfa) erklärt."
@@ -16,5 +16,5 @@
 			[menuTitle]="benutzerleitfadenMenuItem.headline"
 			[url]="apiRootStateResource.resource | getUrl: apiRootLinkRel.DOCUMENTATIONS">
 		</alfa-documentation>
-	</alfa-menu-item>
-</alfa-ozgcloud-menu>
+	</ozgcloud-menu-item>
+</ozgcloud-menu>
diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss
index c9be6868915d540f3caf929ce3931be282cea6f7..b6684420af7831874135b303e60daad3f0abc20d 100644
--- a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss
+++ b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss
@@ -6,6 +6,6 @@
 	color: $grey;
 }
 
-alfa-ozgcloud-icon {
+ozgcloud-icon {
 	margin-right: 4px;
 }
diff --git a/goofy-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/goofy-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
index 03ca47a27de4dbc59d44aa46af122d7c357b96a5..7232792d75bf373417f6e9f78e836efc13f8c3a7 100644
--- a/goofy-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
+++ b/goofy-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
@@ -23,10 +23,10 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-icon-button-with-spinner
+<ozgcloud-icon-button-with-spinner
 		*ngIf="vorgang | hasLink: linkRel.ASSIGN"
 		svgIcon="account_outline"
 		toolTip="Bearbeiter zuordnen"
 		(clickEmitter)="showUserProfileSearch()"
 		data-test-id="assign-user-profile-icon-button">
-</alfa-icon-button-with-spinner>
+</ozgcloud-icon-button-with-spinner>
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
index f0c3dc60fe5e325254b180acb0da348d3f3880f2..6c7d7ab539b6a95fef6d32cb0f9b8c0e2c5d5057 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="userProfileStateResource" diameter="30" padding="3">
+<ozgcloud-spinner [stateResource]="userProfileStateResource" diameter="30" padding="3">
 	<div [matTooltipDisabled]="disableTooltip" data-test-class="user-profile-icon"
 		[class.initials]="!!userProfileStateResource.resource || userProfileStateResource.error"
 		class="user-profile" [matTooltip]="tooltip">
@@ -38,4 +38,4 @@
 			</ng-template>
 		<div class="picture"></div>
 	</div>
-</alfa-spinner>
+</ozgcloud-spinner>
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
index 74a2626fdcbeae224d57d90cf2b3903e40713981..59c44f782751746884e0ca9038bbf534639724cc 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
@@ -23,15 +23,15 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="currentUserResource" [diameter]="30">
+<ozgcloud-spinner [stateResource]="currentUserResource" [diameter]="30">
 	<button mat-icon-button [matMenuTriggerFor]="accountMenu.matMenu" class="big-button" data-test-id="user-icon-button" [attr.aria-label]="buttonLabel">
 		<alfa-user-icon [userProfileStateResource]="currentUserResource"></alfa-user-icon>
 	</button>
-</alfa-spinner>
+</ozgcloud-spinner>
 
-<alfa-ozgcloud-menu #accountMenu data-test-id="account-menu">
+<ozgcloud-menu #accountMenu data-test-id="account-menu">
 	<button mat-menu-item (click)="logoutEmitter.emit()" data-test-id="logout-button">
 		<mat-icon>logout</mat-icon>
 		<span>Abmelden</span>
 	</button>
-</alfa-ozgcloud-menu>
+</ozgcloud-menu>
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.html
index 1f32edf9a1c0e5ff5946c6446dfc5adefcff0356..35957f2abe98069d15d73449b4aa0af40d103e5b 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.html
@@ -35,8 +35,8 @@
 	</alfa-user-icon>
 </button>
 
-<alfa-ozgcloud-menu #menu>
+<ozgcloud-menu #menu>
 	<alfa-user-profile-search-container *ngIf="showUserProfileSearch$ | async" data-test-id="user-profile-search-container"
 		(click)="$event.stopPropagation()" (assigned)="menuTrigger.closeMenu()">
 	</alfa-user-profile-search-container>
-</alfa-ozgcloud-menu>
+</ozgcloud-menu>
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.component.html
index 0913f677db76fc46c8c45659dc401b4145f2e070..70231b9db45155b351976b630f2d2a6240a69375 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.component.html
@@ -25,9 +25,9 @@
 -->
 <div *ngIf="assignTo$ | async as assignTo" class="container">
 
-	<alfa-spinner [stateResource]="assignTo"
+	<ozgcloud-spinner [stateResource]="assignTo"
 			diameter="30" class="spinner">
-	</alfa-spinner>
+	</ozgcloud-spinner>
 
 	<div *ngIf="assignedToName" class="search-overlay">{{assignedToName}}</div>
 
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.html
index ff07d0c04a7e4c59ec7ce2544cdf2d1deef5307b..d99f7f5502ac44267cb72fad6b8150160fce80b0 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.html
@@ -25,13 +25,13 @@
 -->
 <form class="form" [formGroup]="form">
 
-	<alfa-autocomplete-editor data-test-id="user-search"
+	<ozgcloud-autocomplete-editor data-test-id="user-search"
 			label="Bearbeiter"
 			[formControlName]="formServiceClass.SEARCH_FIELD"
 			[values]="searchedUserProfiles.resource"
 			(onKeyUp)="onKeyUp()"
 			(onOptionSelected)="assign($event)"
 			(enterOnNoSelection)="setEmptySelectionError()">
-	</alfa-autocomplete-editor>
+	</ozgcloud-autocomplete-editor>
 
 </form>
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.html b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.html
index 5755819dc8a3b9058e4f020253325953faf10979..a95d8d4d092851f8f54905c1315bb98257b16dde 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.html
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.html
@@ -23,9 +23,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-slide-toggle data-test-id="dark-mode"
+<ozgcloud-slide-toggle data-test-id="dark-mode"
 	label="Dark Mode"
 	[checked]="darkMode"
 	(valueChanged)="valueChanged.emit($event)">
-</alfa-slide-toggle>
+</ozgcloud-slide-toggle>
 
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.scss b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.scss
index 82be9608c300aa4026022fd213aeb63f46dfcf49..dd73ed80dd0d4065713a6d5126ca7316fba14ee9 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.scss
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component.scss
@@ -21,6 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-alfa-slide-toggle {
+ozgcloud-slide-toggle {
 	display: block;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.html b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.html
index a5dc19bdbd8f7548f3a5e426a0ed35149a48db9e..ea752f8abb1f8cf8643e6b54b81432f1749304c6 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.html
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.html
@@ -25,11 +25,11 @@
 -->
 <ng-container *ngIf="userSettings.resource">
 
-	<alfa-slide-toggle *ngIf="userSettings.resource | hasLink: userSettingsLinkRel.EDIT" data-test-id="email-benachrichtigung"
+	<ozgcloud-slide-toggle *ngIf="userSettings.resource | hasLink: userSettingsLinkRel.EDIT" data-test-id="email-benachrichtigung"
 		label="Benachrichtigung per E-Mail"
 		toolTip="Benachrichtigung per E-Mail bei Eingang eines Antrags"
 		[checked]="isChecked(userSettings.resource)"
 		(valueChanged)="valueChanged.emit($event)">
-	</alfa-slide-toggle>
+	</ozgcloud-slide-toggle>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.scss b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.scss
index 0bcf2e2d944506b129b0f9fee422a8dad1ae4d8d..e1c6900b2cf0104008fbc6d294e0ba7e543335ed 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.scss
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.scss
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-alfa-slide-toggle {
+ozgcloud-slide-toggle {
 	margin-bottom: 0.5rem;
 	display: block;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.html b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.html
index 6049f1c42e10ba3f349eae49095181630000f1a2..b4374737442171eb74247356447008f83ce70748 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.html
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.html
@@ -23,4 +23,4 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-icon-button-with-spinner icon="settings" toolTip="Einstellungen" data-test-id="menu-button"></alfa-icon-button-with-spinner>
\ No newline at end of file
+<ozgcloud-icon-button-with-spinner icon="settings" toolTip="Einstellungen" data-test-id="menu-button"></ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss
index 5f61af647dd365666bbdda3f82b1d626ab23edff..cfb01d230ea12e3143d5b085e3a441b7ff3b5877 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss
@@ -21,6 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-alfa-icon-button-with-spinner {
+ozgcloud-icon-button-with-spinner {
 	display: block;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
index ce6dcfd0066778f10359043b4362261ebf350643..f2d51621473931cb3b20852311943f8396aade9c 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
@@ -26,9 +26,9 @@
 <alfa-user-settings-menu-button [matMenuTriggerFor]="settingsMenu.matMenu" data-test-id="menu-button"></alfa-user-settings-menu-button>
 
 <!-- TODO Das Menu in eine eigene Componente auslagern um die Technik zu kapseln -->
-<alfa-ozgcloud-menu #settingsMenu>
+<ozgcloud-menu #settingsMenu>
 	<div class="menu-container" (click)="$event.stopPropagation()">
 		<alfa-user-settings-email-benachrichtigung-container *ngIf="apiRoot.resource | hasLink: apiRootLinkRel.CURRENT_USER" data-test-id="email-benachrichtigung-toggle"></alfa-user-settings-email-benachrichtigung-container>
 		<alfa-user-settings-darkmode-container></alfa-user-settings-darkmode-container>
 	</div>
-</alfa-ozgcloud-menu>
\ No newline at end of file
+</ozgcloud-menu>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index a9f54e1b20cd02e590244e96d0d8f4249b254b0d..fe9fbd96d29589b825f65c8e0f374f557cce5bf3 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.ABSCHLIESSEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="abschliessen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="abschliessen-button"
 		text="Abschließen"
 		icon="done"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="abschliessen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="abschliessen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="abschliessen-icon-button"
 		icon="done"
 		toolTip="Vorgang abschließen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="abschliessen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index 9d4f91246e0664f13fc24bfa79693119d8939931..b3dab7af2dec209398318dd66829f56f05b4628e 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.ANNEHMEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="annehmen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="annehmen-button"
 		text="Annehmen"
 		icon="check_circle_outline"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="annehmen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="annehmen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="annehmen-icon-button"
 		icon="check_circle_outline"
 		toolTip="Vorgang annehmen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="annehmen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index 9519318314a9f35ee0f654d4ac34748c126ffc57..bf082a9ac7f17d15b30dd6f85e86de054084fc55 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.BEARBEITEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="bearbeiten-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="bearbeiten-button"
 		text="Bearbeiten"
 		icon="edit_icon"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="bearbeiten()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="bearbeiten-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="bearbeiten-icon-button"
 		svgIcon="edit"
 		toolTip="Vorgang bearbeiten"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="bearbeiten()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index 36b444555daf03f6d329f8293081c1b621a8290b..aad567ea69a91f0f79309c9d0e4d8a6f4fe7c106 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.BESCHEIDEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="bescheiden-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="bescheiden-button"
 		text="Bescheiden"
 		svgIcon="stamp"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="bescheiden()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="bescheiden-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="bescheiden-icon-button"
 		svgIcon="stamp"
 		toolTip="Vorgang bescheiden"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="bescheiden()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index f2c62e866c09bec828905d3c315af02c66667d96..cc4bae76031bc1c156c7fb64610bb25004add05a 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.VERWERFEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="verwerfen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="verwerfen-button"
 		text="Verwerfen"
 		svgIcon="discard_document"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="verwerfen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="verwerfen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="verwerfen-icon-button"
 		svgIcon="discard_document"
 		toolTip="Vorgang verwerfen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="verwerfen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
index f259795c91717bb433197e74b7cb27914af12c4b..0edf1379b7a5d691152c50ec7c225c2089386908 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.WIEDEREROEFFNEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="wiedereroeffnen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="wiedereroeffnen-button"
 		text="Wiedereröffnen"
 		icon="undo"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="wiedereroeffnen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="wiedereroeffnen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="wiedereroeffnen-icon-button"
 		icon="undo"
 		toolTip="Vorgang wiedereröffnen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="wiedereroeffnen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index 973b5a6f59081509131e61bc4fcd2046c385732b..2bd8e2e0734c54ac403032a5667554ecd0c7bc4c 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.ZURUECKHOLEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="zurueckholen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="zurueckholen-button"
 		text="Zurückholen"
 		icon="undo"
 		[stateResource]="commandStateResource$ | async"
 		(click)="zurueckholen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="zurueckholen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="zurueckholen-icon-button"
 		icon="undo"
 		toolTip="Vorgang zurückholen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="zurueckholen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
index d92ae27f3a40796b918c587472557194d06650eb..f93ef1a91c6d7232d98f9f0275e85b1bc842fd96 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
@@ -25,18 +25,18 @@
 -->
 <ng-container *ngIf="vorgang | hasLink: linkRel.ZURUECKSTELLEN">
 
-	<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="zurueckstellen-button"
+	<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="zurueckstellen-button"
 		text="Zurückstellen"
 		icon="undo"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="zurueckstellen()">
-	</alfa-ozgcloud-stroked-button-with-spinner>
+	</ozgcloud-stroked-button-with-spinner>
 
-	<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="zurueckstellen-icon-button"
+	<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="zurueckstellen-icon-button"
 		icon="undo"
 		toolTip="Vorgang zurückstellen"
 		[stateResource]="commandStateResource$ | async"
 		(clickEmitter)="zurueckstellen()">
-	</alfa-icon-button-with-spinner>
+	</ozgcloud-icon-button-with-spinner>
 
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index 8c87b4f092516779edc9604177e316ad2f4968d6..e56f15883115c8a91b6e21fcf6f4d4eb944754b4 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="vorgangStateResource" class="header-spinner"></alfa-spinner>
+<ozgcloud-spinner [stateResource]="vorgangStateResource" class="header-spinner"></ozgcloud-spinner>
 
 <ng-container *ngIf="vorgangStateResource.resource as vorgangResource">
 	<div class="container">
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.scss b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.scss
index 191fe074c0afd0ac778028037ef258accc079158..ec8a86b4ded2172fc29b510ed4020ebb62783a50 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.scss
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.scss
@@ -25,7 +25,7 @@
 	margin-left: 48px;
 
 	::ng-deep {
-		alfa-ozgcloud-stroked-button-with-spinner {
+		ozgcloud-stroked-button-with-spinner {
 			margin: 0 8px;
 		}
 	}
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-antrag-data/vorgang-detail-antrag-data.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-antrag-data/vorgang-detail-antrag-data.component.html
index 3aead49404807ce9714914952c1a5d417ccb0212..3791a5ad68bc14db675df27b751e49b783fc514f 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-antrag-data/vorgang-detail-antrag-data.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-antrag-data/vorgang-detail-antrag-data.component.html
@@ -25,16 +25,16 @@
 -->
 <div *ngIf="eingang" data-test-id="antragdaten-panel">
 
-	<alfa-expansion-panel *ngIf="eingang.header as header" data-test-id="header-panel"
+	<ozgcloud-expansion-panel *ngIf="eingang.header as header" data-test-id="header-panel"
 		headline="Header">
 		<alfa-vorgang-detail-eingang-header [eingangHeader]="header"></alfa-vorgang-detail-eingang-header>
-	</alfa-expansion-panel>
+	</ozgcloud-expansion-panel>
 
-	<alfa-expansion-panel *ngIf="eingang.antragsteller?.otherData as antragstellerOtherData" data-test-id="antragsteller-other-data-table"
+	<ozgcloud-expansion-panel *ngIf="eingang.antragsteller?.otherData as antragstellerOtherData" data-test-id="antragsteller-other-data-table"
 		[headline]="'Weitere Daten zum Antragsteller'">
 
 		<alfa-vorgang-detail-form-data-table [formData]="antragstellerOtherData"></alfa-vorgang-detail-form-data-table>
-	</alfa-expansion-panel>
+	</ozgcloud-expansion-panel>
 
 	<alfa-vorgang-detail-form-data-table *ngIf="antragsData" data-test-id="antragdaten"
 		[formData]="antragsData">
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-form-data-table/vorgang-detail-form-data-table.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-form-data-table/vorgang-detail-form-data-table.component.html
index 0fc1b377b0a9ffda163e3997ecc454fc646a265e..a11a17aacc7b8cef426aabde9e1fea57df8837ba 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-form-data-table/vorgang-detail-form-data-table.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-form-data-table/vorgang-detail-form-data-table.component.html
@@ -30,9 +30,9 @@
 	</tr>
 	<tr *ngFor="let row of formData | keyvalue: originalOrder">
 		<td colspan="2" *ngIf="isExpandable(row.value); else keyValueEntry">
-			<alfa-expansion-panel [headline]="getLabel(row)" data-test-class="panel">
+			<ozgcloud-expansion-panel [headline]="getLabel(row)" data-test-class="panel">
 				<alfa-vorgang-detail-form-data-table [formData]="row.value.value"></alfa-vorgang-detail-form-data-table>
-			</alfa-expansion-panel>
+			</ozgcloud-expansion-panel>
 		</td>
 		<ng-template #keyValueEntry>
 			<td class="key">{{getLabel(row)}}</td>
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.html
index d7742d93811b998d1febfb3be0d9c08147dd6f40..8cc03b1f500f31c7f08a563ae6a05d809ae11702 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-expansion-panel *ngIf="vorgangWithEingang.eingang" data-test-id="formulardaten-panel"
+<ozgcloud-expansion-panel *ngIf="vorgangWithEingang.eingang" data-test-id="formulardaten-panel"
 	headline="Formulardaten">
 
 	<mat-tab-group mat-stretch-tabs="false" mat-align-tabs="start" animationDuration="0" [selectedIndex]="defaultSelection">
@@ -52,5 +52,5 @@
 		</mat-tab>
 	</mat-tab-group>
 
-</alfa-expansion-panel>
+</ozgcloud-expansion-panel>
 
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button/vorgang-detail-back-button.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button/vorgang-detail-back-button.component.html
index 21347682d567b88a6fc1c5abcf78ed1ca95b5001..3bfbfe78c25d0d6b700a28cde2eebac828c7a394 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button/vorgang-detail-back-button.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button/vorgang-detail-back-button.component.html
@@ -23,4 +23,4 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-back-button [linkTo]="routePath" label="zurück zur Vorgangsliste"></alfa-back-button>
\ No newline at end of file
+<ozgcloud-back-button [linkTo]="routePath" label="zurück zur Vorgangsliste"></ozgcloud-back-button>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index 802c2c0a3755dffd8e82fc15808abd047139ac3b..7ce2c344b8cd556227a57e08654f417c2c624d98 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -1,12 +1,12 @@
 <button *ngIf="buttonEnabled" mat-icon-button [matMenuTriggerFor]="moreMenu.matMenu" #menuTrigger="matMenuTrigger" data-test-id="more-menu-button">
-	<alfa-ozgcloud-icon icon="more_horiz"></alfa-ozgcloud-icon>
+	<ozgcloud-icon icon="more_horiz"></ozgcloud-icon>
 </button>
-<alfa-ozgcloud-menu #moreMenu data-test-id="more-menu">
-	<alfa-menu-item (click)="$event.stopPropagation()" *ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT" data-test-id="vorgang-exportieren-button"
+<ozgcloud-menu #moreMenu data-test-id="more-menu">
+	<ozgcloud-menu-item (click)="$event.stopPropagation()" *ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT" data-test-id="vorgang-exportieren-button"
 		headline="Vorgang exportieren"
 		text="Alle Informationen und Anhänge des Vorgangs zur Archivierung im DMS."
 		icon="xdomea_file"
 		[iconSizeBig]="true">
 			<alfa-vorgang-export-container [vorgangWithEingang]="vorgangWithEingang" (closeMenu)="closeMenu()"></alfa-vorgang-export-container>
-	</alfa-menu-item>
-</alfa-ozgcloud-menu>
+	</ozgcloud-menu-item>
+</ozgcloud-menu>
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
index acbf5ec9400fab19d234f9ec8b11bca6240b767a..c81312c2fd3a4d388dab360b636b63772d2008a2 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
@@ -1,6 +1,6 @@
-<alfa-ozgcloud-button-with-spinner dataTestId="export-vorgang"
+<ozgcloud-button-with-spinner dataTestId="export-vorgang"
 	[showSpinner]="(exportStateResource$ | async)?.loading"
 	(clickEmitter)="export()"
 	text="Herunterladen"
 	icon="save_alt">
-</alfa-ozgcloud-button-with-spinner>
\ No newline at end of file
+</ozgcloud-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
index ee5934c25e53eea22d5c97fa8ab1637347130e2e..b9e219cc88e5d683f64e9fcb1b21ce50aaa85142 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
@@ -25,11 +25,11 @@
 -->
 <ng-container *ngIf="vorgangStateResource$ | async as vorgangStateResource">
 
-	<alfa-subnavigation class="mat-app-background">
+	<ozgcloud-subnavigation class="mat-app-background">
 		<alfa-vorgang-detail-back-button-container></alfa-vorgang-detail-back-button-container>
 		<alfa-vorgang-detail-action-buttons [vorgangWithEingang]="vorgangStateResource.resource"></alfa-vorgang-detail-action-buttons>
 		<alfa-vorgang-detail-more-menu [vorgangWithEingang]="vorgangStateResource.resource"></alfa-vorgang-detail-more-menu>
-	</alfa-subnavigation>
+	</ozgcloud-subnavigation>
 
 	<div class="l-scroll-area--full">
 		<alfa-vorgang-detail-area [vorgangStateResource]="vorgangStateResource"></alfa-vorgang-detail-area>
@@ -37,5 +37,5 @@
 
 </ng-container>
 
-<alfa-progress-bar [stateResource]="revokeCommandStateResource$ | async"></alfa-progress-bar>
-<alfa-spinner-transparency [stateResource]="vorgangLoeschenCommandStateResource$ | async"></alfa-spinner-transparency>
\ No newline at end of file
+<ozgcloud-progress-bar [stateResource]="revokeCommandStateResource$ | async"></ozgcloud-progress-bar>
+<ozgcloud-spinner-transparency [stateResource]="vorgangLoeschenCommandStateResource$ | async"></ozgcloud-spinner-transparency>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.spec.ts
index 11f3186a8c3836700ac30110da8e4e01396643dc..264ffaefc7942403d1222072215ad1c3657f806d 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.spec.ts
@@ -50,7 +50,7 @@ describe('VorgangDetailPageComponent', () => {
 
 	const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource();
 
-	const subnavigation: string = 'alfa-subnavigation';
+	const subnavigation: string = 'ozgcloud-subnavigation';
 
 	beforeEach(async () => {
 		await TestBed.configureTestingModule({
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.html b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.html
index 5b01e7754d7187462717d83a885fcc235c9fb0a5..5b5c0601667a29b016e28b77971ae20227b0cb31 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.html
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.html
@@ -47,7 +47,7 @@
 			   (focusin)="focusIn()"/>
 
 			<mat-autocomplete #searchAutoComplete="matAutocomplete" class="vorgang-search" (optionSelected)="formService.submitByPreviewList($event.option.value, searchString)">
-				<alfa-spinner [stateResource]="vorgangSearchPreviewList" [class.autocomplete-spinner]="vorgangSearchPreviewList.loading"></alfa-spinner>
+				<ozgcloud-spinner [stateResource]="vorgangSearchPreviewList" [class.autocomplete-spinner]="vorgangSearchPreviewList.loading"></ozgcloud-spinner>
 
 				<ng-container *ngIf="vorgangSearchPreviewList.resource" data-test-id="search-preview-list">
 					<mat-option *ngFor="let vorgang of (vorgangSearchPreviewList.resource | toEmbeddedResources: vorgangListLinkRel.VORGANG_HEADER_LIST)" [value]="vorgang">
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html b/goofy-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
index 04751a24612252203d91bda8cdfc04143b154f2f..9a24c31d3907979c0dcf2f266d2d274ebc2bcae1 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
@@ -1,8 +1,8 @@
 <div [class.red]="isOverdue" data-test-class="wiedervorlage-icon">
 	<ng-container *ngIf="isOverdue; else defaultFrist">
-		<alfa-ozgcloud-svgicon svgIcon="resubmission_expired" data-test-class="wiedervorlage-icon-is-overdue"></alfa-ozgcloud-svgicon>
+		<ozgcloud-svgicon svgIcon="resubmission_expired" data-test-class="wiedervorlage-icon-is-overdue"></ozgcloud-svgicon>
 	</ng-container>
 	<ng-template #defaultFrist>
-		<alfa-ozgcloud-icon icon="update" data-test-class="wiedervorlage-icon-default"></alfa-ozgcloud-icon>
+		<ozgcloud-icon icon="update" data-test-class="wiedervorlage-icon-default"></ozgcloud-icon>
 	</ng-template>
 </div>
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
index 4095f5bd1dc39e381fe550e0c82114b9fe2cb3b9..0f367da8886615808c22aceab48e7316113dc6a5 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
@@ -35,11 +35,11 @@
 			class="status-text"></alfa-vorgang-status-text>
 	</div>
 
-	<alfa-postfach-icon data-test-class="postfach-icon"
+	<ozgcloud-postfach-icon data-test-class="postfach-icon"
 		*ngIf="vorgang.hasPostfachNachricht === true"
 		[showBadge]="vorgang.hasNewPostfachNachricht"
 		class="postfach-icon">
-	</alfa-postfach-icon>
+	</ozgcloud-postfach-icon>
 
 	<div class="aktenzeichen">
 		<mat-icon svgIcon="az"></mat-icon>
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list.component.html b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list.component.html
index 8aff33f357d17f0dcd3a47800d8e77584237022e..642835db13e0b2a81a475ab824006e5ce84b01d3 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list.component.html
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list.component.html
@@ -25,7 +25,7 @@
 -->
 <alfa-vorgang-list-item *ngFor="let vorgang of vorgaenge" [vorgang]="vorgang"></alfa-vorgang-list-item>
 
-<alfa-spinner diameter="60" [stateResource]="vorgangListPageResource"></alfa-spinner>
+<ozgcloud-spinner diameter="60" [stateResource]="vorgangListPageResource"></ozgcloud-spinner>
 
 <ng-container *ngIf="apiRootStateResource.resource | hasLink: apiRootLinkRel.HINTS; else emptyListResult">
 	<alfa-hint-container data-test-id="hint-container"></alfa-hint-container>
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/_vorgang-views-menu.theme.scss b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/_vorgang-views-menu.theme.scss
index 7db4706e7f49767cba152abf0ee029357ab1b6a6..b1ccf782f3c5d5e94f28345bc0ec28dc16ee651e 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/_vorgang-views-menu.theme.scss
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/_vorgang-views-menu.theme.scss
@@ -14,7 +14,7 @@ alfa-vorgang-search-view-item {
 
 alfa-vorgang-view-item,
 alfa-vorgang-search-view-item {
-	alfa-ozgcloud-routing-button {
+	ozgcloud-routing-button {
 		.mat-mdc-button {
 			text-align: left;
 			width: 100%;
@@ -42,7 +42,7 @@ alfa-vorgang-search-view-item {
 body.dark {
 	alfa-vorgang-view-item,
 	alfa-vorgang-search-view-item-container {
-		alfa-ozgcloud-routing-button {
+		ozgcloud-routing-button {
 			&.selected .mat-mdc-button {
 				background-color: #212121;
 			}
@@ -51,7 +51,7 @@ body.dark {
 }
 
 alfa-vorgang-view-item {
-	alfa-ozgcloud-routing-button {
+	ozgcloud-routing-button {
 		.dot {
 			border-radius: 50%;
 			border: 1px solid darken(#E4E4E4, 30%);
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.html b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.html
index 586042d2cbe0368edcf6dc0387e9114f6e57831e..62d3a47a3d80749fd4e126842a1934eda5d06723 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.html
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.html
@@ -1,4 +1,4 @@
-<alfa-ozgcloud-routing-button [routerLinkPath]="routePath" [class.selected]="isSelected" data-test-id="views-menu-item-Suche">
-	<alfa-ozgcloud-icon icon="search"></alfa-ozgcloud-icon>
+<ozgcloud-routing-button [routerLinkPath]="routePath" [class.selected]="isSelected" data-test-id="views-menu-item-Suche">
+	<ozgcloud-icon icon="search"></ozgcloud-icon>
 	Suche
-</alfa-ozgcloud-routing-button>
\ No newline at end of file
+</ozgcloud-routing-button>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.scss b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.scss
index 5eccc52abe56193fe044cfd8e3188c94e53a811a..fdf84892eecf5e44341bee847c0e3bec2066bc0a 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.scss
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-search-view-item-container/vorgang-search-view-item/vorgang-search-view-item.component.scss
@@ -1,3 +1,3 @@
-alfa-ozgcloud-icon {
+ozgcloud-icon {
 	margin-right: 6px;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.html b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.html
index ebde7fe4ee3e12c6c3b8e5ad3e7b5f33e074bff4..a43b80711dde8410be9a43729dc2805f4ac7ed1a 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.html
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-view-item-container/vorgang-view-item/vorgang-view-item.component.html
@@ -1,5 +1,5 @@
-<alfa-ozgcloud-routing-button [routerLinkPath]="routePath" [class.selected]="isSelected" [attr.data-test-id]="'views-menu-item-' + (label | convertForDataTest)">
+<ozgcloud-routing-button [routerLinkPath]="routePath" [class.selected]="isSelected" [attr.data-test-id]="'views-menu-item-' + (label | convertForDataTest)">
 	<ng-content></ng-content>
     <div class="label">{{ label }}</div>
 	<div [attr.data-test-id]="'views-menu-item-count-' + (label | convertForDataTest)">{{count}}</div>
-</alfa-ozgcloud-routing-button>
\ No newline at end of file
+</ozgcloud-routing-button>
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
index 1faf98ec662e2cfd28e1e2c4e74d17c35acc2196..772f2ae2c24d8c75850fd036e4e2e089fb29e8c9 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
@@ -59,7 +59,7 @@
 		</alfa-vorgang-view-item-container>
 		<alfa-vorgang-view-item-container *ngIf="apiRootResource | hasAnyLink: apiRootLinkRel.ALLE_VORGAENGE: apiRootLinkRel.MEINE_VORGAENGE: apiRootLinkRel.UNASSIGNED" data-test-id="vorgang-vorgang-list-view"
 			label="Vorgangsliste" [view]="vorgangView.VORGANG_LIST" class="top-border">
-			<alfa-ozgcloud-icon icon="format_list_bulleted"></alfa-ozgcloud-icon>
+			<ozgcloud-icon icon="format_list_bulleted"></ozgcloud-icon>
 		</alfa-vorgang-view-item-container>
 		<alfa-vorgang-search-view-item-container *ngIf="apiRootResource | hasAnyLink: apiRootLinkRel.SEARCH_ALLE: apiRootLinkRel.SEARCH_MEINE: apiRootLinkRel.SEARCH_UNASSIGNED" data-test-id="vorgang-search-view" class="top-border">
 		</alfa-vorgang-search-view-item-container>
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
index 9a947ff9fdb55920f75ba5a5df6a60e51d9997e8..e9a29158e303fa66ee4b9b991c7728ccc272148b 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
@@ -64,6 +64,6 @@ hr {
 	}
 }
 
-alfa-ozgcloud-icon {
+ozgcloud-icon {
 	margin-right: 6px;
 }
\ No newline at end of file
diff --git a/goofy-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/goofy-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index 5011158096b11fcaf357ce841d9bfbd1e99935a3..31feb82f6148e2dd3e726cdce67d424f388f085b 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -23,9 +23,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-icon-button-with-spinner *ngIf="wiedervorlage | hasLink: linkRel.ERLEDIGEN" data-test-id="erledigen-icon-button"
+<ozgcloud-icon-button-with-spinner *ngIf="wiedervorlage | hasLink: linkRel.ERLEDIGEN" data-test-id="erledigen-icon-button"
 	[stateResource]="erledigenCommand$ | async"
 	icon="check_circle_outline"
 	toolTip="Als erledigt markieren"
 	(clickEmitter)="erledigen()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html b/goofy-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
index 31ccf7e2592127cc25fa5140a058944243c15f69..d586ce2782546305ef0ed97ed46cc68aabcf68b2 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
@@ -23,14 +23,14 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" text="Speichern" data-test-id="speichern-button"
+<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" text="Speichern" data-test-id="speichern-button"
 	icon="save_alt"
 	[stateResource]="submitInProgress$ | async"
 	(clickEmitter)="submit()">
-</alfa-ozgcloud-stroked-button-with-spinner>
+</ozgcloud-stroked-button-with-spinner>
 
-<alfa-icon-button-with-spinner *ngIf="showAsIconButton"
+<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton"
 	icon="save_alt" toolTip="Wiedervorlage speichern"
 	[stateResource]="submitInProgress$ | async"
 	(clickEmitter)="submit()">
-</alfa-icon-button-with-spinner>
+</ozgcloud-icon-button-with-spinner>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
index c4a1006e28b03ffb8eb9ebbe94ddc3a9b17118b6..09aa60017e8cc4c805800ea5f947542095ecc7b9 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
@@ -23,9 +23,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-icon-button-with-spinner *ngIf="wiedervorlage | hasLink: linkRel.WIEDEREROEFFNEN" data-test-id="wiedereroeffnen-icon-button"
+<ozgcloud-icon-button-with-spinner *ngIf="wiedervorlage | hasLink: linkRel.WIEDEREROEFFNEN" data-test-id="wiedereroeffnen-icon-button"
 	[stateResource]="wiedereroeffnenCommand$ | async"
 	icon="check_circle_outline"
 	toolTip="Als offen markieren"
 	(clickEmitter)="wiedereroeffnen()">
-</alfa-icon-button-with-spinner>
\ No newline at end of file
+</ozgcloud-icon-button-with-spinner>
\ No newline at end of file
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
index fa5b705f7f59e5029dcb5eab67bf6f07727cad9b..a3e8a2574504fc7699ce9fb06490ff00571fd754 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
@@ -28,13 +28,13 @@
 	<div class="create-button" *ngIf="wiedervorlageListResource | hasLink: wiedervorlageListLinkRel.CREATE_WIEDERVORLAGE">
 		<a [routerLink]="'wiedervorlage/' + wiedervorlageRoute.NEW" tabindex="-1">
 
-			<alfa-ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="create-wiedervorlage"
+			<ozgcloud-stroked-button-with-spinner *ngIf="!showAsIconButton" data-test-id="create-wiedervorlage"
 				class="create-button" text="Wiedervorlage" icon="add">
-			</alfa-ozgcloud-stroked-button-with-spinner>
+			</ozgcloud-stroked-button-with-spinner>
 
-			<alfa-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="create-wiedervorlage-icon-button"
+			<ozgcloud-icon-button-with-spinner *ngIf="showAsIconButton" data-test-id="create-wiedervorlage-icon-button"
 				icon="update" toolTip="Wiedervorlage erstellen">
-			</alfa-icon-button-with-spinner>
+			</ozgcloud-icon-button-with-spinner>
 
 		</a>
 	</div>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component.html
index f80273fb0ff55676f2f39b13509a99d90de76a7b..70b1a9e7861b9e03c32fc63033da7eb3814e9ffe 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component.html
@@ -23,10 +23,10 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="wiedervorlageListStateResource">
+<ozgcloud-spinner [stateResource]="wiedervorlageListStateResource">
 	<ng-container *ngIf="wiedervorlageListStateResource.resource as wiedervorlageList">
 
-		<alfa-expansion-panel headline="Wiedervorlagen">
+		<ozgcloud-expansion-panel headline="Wiedervorlagen">
 
 			<ng-container *ngFor="let wiedervorlageResource of (wiedervorlageList | toEmbeddedResources: wiedervorlageListLinkRel.WIEDERVORLAGE_LIST)">
 				<alfa-wiedervorlage-in-vorgang data-test-id="wiedervorlage-in-vorgang"
@@ -34,9 +34,9 @@
 				</alfa-wiedervorlage-in-vorgang>
 			</ng-container>
 
-		</alfa-expansion-panel>
+		</ozgcloud-expansion-panel>
 
 		<alfa-wiedervorlage-create-button [wiedervorlageListStateResource]="wiedervorlageListStateResource" class="create-button"></alfa-wiedervorlage-create-button>
 
 	</ng-container>
-</alfa-spinner>
+</ozgcloud-spinner>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.html
index aa035ffd2ec3ade1237f93eadaf3e53e590c5212..b100f5c8eba6918d529577fb9d20313bdaa7a6a2 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.html
@@ -26,14 +26,14 @@
 <ng-container *ngIf="wiedervorlageListStateResource$ | async as wiedervorlageListStateResource">
 	<ng-container *ngIf="wiedervorlageListStateResource.resource">
 
-		<alfa-spinner [stateResource]="wiedervorlageStateResource$ | async">
+		<ozgcloud-spinner [stateResource]="wiedervorlageStateResource$ | async">
 
 			<alfa-wiedervorlage-page data-test-id="wiedervorlage-page"
 				[wiedervorlageListStateResource]="wiedervorlageListStateResource"
 				[wiedervorlageStateResource]="wiedervorlageStateResource$ | async">
 			</alfa-wiedervorlage-page>
 
-		</alfa-spinner>
+		</ozgcloud-spinner>
 
 	</ng-container>
 </ng-container>
\ No newline at end of file
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
index 6505e951586c0d2ed3ecc1e28d5fbe6fcfbca4f7..ede46db22d54c95acde79a99cad52a11342bcede 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-back-button linkTo="../.." label="zurück zur Detailseite"></alfa-back-button>
+<ozgcloud-back-button linkTo="../.." label="zurück zur Detailseite"></ozgcloud-back-button>
 <alfa-erledigen-button-container [wiedervorlage]="wiedervorlage"></alfa-erledigen-button-container>
 <alfa-wiedereroeffnen-button-container [wiedervorlage]="wiedervorlage"></alfa-wiedereroeffnen-button-container>
 <alfa-submit-wiedervorlage-button [showAsIconButton]="true"></alfa-submit-wiedervorlage-button>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.html
index 22a169f43d3b8b8d0a893cef3408e5f548fa0346..7f28f7d8864fbcfaaad4be9f9205620cf4d84fff 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.html
@@ -25,14 +25,14 @@
 -->
 <form class="form" [formGroup]="formService.form">
 
-	<alfa-text-editor label="Betreff" [formControlName]="formServiceClass.FIELD_BETREFF">
-	</alfa-text-editor>
+	<ozgcloud-text-editor label="Betreff" [formControlName]="formServiceClass.FIELD_BETREFF">
+	</ozgcloud-text-editor>
 
-	<alfa-textarea-editor label="Beschreibung" [formControlName]="formServiceClass.FIELD_BESCHREIBUNG">
-	</alfa-textarea-editor>
+	<ozgcloud-textarea-editor label="Beschreibung" [formControlName]="formServiceClass.FIELD_BESCHREIBUNG">
+	</ozgcloud-textarea-editor>
 
-	<alfa-date-editor class="date" label="Frist" [formControlName]="formServiceClass.FIELD_FRIST">
-	</alfa-date-editor>
+	<ozgcloud-date-editor class="date" label="Frist" [formControlName]="formServiceClass.FIELD_FRIST">
+	</ozgcloud-date-editor>
 
 	<alfa-binary-file-attachment-container data-test-id="wiedervorlage-attachment-list"
 			[existFiles]="attachments$ | async"
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
index b4e05a8bfcd8636386e105757a3bddde69d1be4d..70907cca0114a9ee391d6e9a7fb1a0c973ca67d6 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
@@ -23,12 +23,12 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-spinner [stateResource]="wiedervorlageStateResource">
+<ozgcloud-spinner [stateResource]="wiedervorlageStateResource">
 
-	<alfa-subnavigation data-test-id="subnavigation-wiedervorlage" class="mat-app-background">
+	<ozgcloud-subnavigation data-test-id="subnavigation-wiedervorlage" class="mat-app-background">
 		<alfa-wiedervorlage-action-buttons [wiedervorlage]="wiedervorlageStateResource.resource">
 		</alfa-wiedervorlage-action-buttons>
-	</alfa-subnavigation>
+	</ozgcloud-subnavigation>
 
 	<div class="l-scroll-area--full">
 		<div class="wrapper">
@@ -45,4 +45,4 @@
 		</div>
 	</div>
 
-</alfa-spinner>
\ No newline at end of file
+</ozgcloud-spinner>
\ No newline at end of file