diff --git a/packages/ui-library/src/components/button-icon/index.ts b/packages/ui-library/src/components/button-icon/index.ts
index f3c70717a..dc0c4584f 100644
--- a/packages/ui-library/src/components/button-icon/index.ts
+++ b/packages/ui-library/src/components/button-icon/index.ts
@@ -34,7 +34,7 @@ export type BlrButtonIconEventHandlers = {
  * @fires blrBlur Button lost focus
  * @fires blrClick Button was clicked
  */
-export class BlrIconButton extends kebabCaseAttributes(LitElement) {
+export class BlrButtonIcon extends kebabCaseAttributes(LitElement) {
   static styles = [styleCustom];
 
   @property() arialabel!: string;
diff --git a/packages/ui-library/src/components/button-text/index.ts b/packages/ui-library/src/components/button-text/index.ts
index b5fbafc25..9934eeb93 100644
--- a/packages/ui-library/src/components/button-text/index.ts
+++ b/packages/ui-library/src/components/button-text/index.ts
@@ -40,7 +40,7 @@ export type BlrButtonTextEventHandlers = {
  * @fires blrBlur Button lost focus
  * @fires blrClick Button was clicked
  */
-export class BlrTextButton extends kebabCaseAttributes(LitElement) {
+export class BlrButtonText extends kebabCaseAttributes(LitElement) {
   static styles = [styleCustom];
 
   @property() label = 'Button Label';
diff --git a/packages/ui-library/src/components/input-field-text/index.ts b/packages/ui-library/src/components/input-field-text/index.ts
index 808669385..a6dba935a 100644
--- a/packages/ui-library/src/components/input-field-text/index.ts
+++ b/packages/ui-library/src/components/input-field-text/index.ts
@@ -39,7 +39,7 @@ export type BlrInputFieldTextEventHandlers = {
  * @fires blrTextValueChange InputFieldText value changed
  * @fires blrSelect Text in InputFieldText got selected
  */
-export class BlrTextInput extends kebabCaseAttributes(LitElement) {
+export class BlrInputFieldText extends kebabCaseAttributes(LitElement) {
   static styles = [styleCustom];
 
   @property() inputFieldTextId!: string;