diff --git a/packages/web-component-library-stencil/src/components/data-list-actions.tsx b/packages/web-component-library-stencil/src/components/data-list-actions.tsx
index 93e0af513ef..2bd97353adc 100644
--- a/packages/web-component-library-stencil/src/components/data-list-actions.tsx
+++ b/packages/web-component-library-stencil/src/components/data-list-actions.tsx
@@ -11,7 +11,7 @@ import { Component, h } from '@stencil/core';
   styleUrl: 'data-list-actions.scss',
   shadow: true,
 })
-export class DataListValue {
+export class DataListActions {
   render() {
     return (
       <dd>
diff --git a/packages/web-component-library-stencil/src/components/data-list-key.tsx b/packages/web-component-library-stencil/src/components/data-list-key.tsx
index 59f936c7fbe..cc2630c4fb2 100644
--- a/packages/web-component-library-stencil/src/components/data-list-key.tsx
+++ b/packages/web-component-library-stencil/src/components/data-list-key.tsx
@@ -11,7 +11,7 @@ import { Component, h } from '@stencil/core';
   styleUrl: 'data-list-key.scss',
   shadow: true,
 })
-export class DataListValue {
+export class DataListKey {
   render() {
     return (
       <dt>
diff --git a/packages/web-component-library-stencil/src/components/logo-button.tsx b/packages/web-component-library-stencil/src/components/logo-button.tsx
index af1326dff81..1fadbdbfb48 100644
--- a/packages/web-component-library-stencil/src/components/logo-button.tsx
+++ b/packages/web-component-library-stencil/src/components/logo-button.tsx
@@ -12,7 +12,7 @@ import { Component, h } from '@stencil/core';
   styleUrl: 'logo-button.scss',
   shadow: true,
 })
-export class DigidButton {
+export class LogoButton {
   render() {
     return (
       <div class="utrecht-logo-button">
diff --git a/packages/web-component-library-stencil/src/components/number-badge.tsx b/packages/web-component-library-stencil/src/components/number-badge.tsx
index aab066ea5fb..2cf4b408bad 100644
--- a/packages/web-component-library-stencil/src/components/number-badge.tsx
+++ b/packages/web-component-library-stencil/src/components/number-badge.tsx
@@ -11,7 +11,7 @@ import { Component, h, Prop } from '@stencil/core';
   styleUrl: 'number-badge.scss',
   shadow: true,
 })
-export class BadgeCounter {
+export class NumberBadge {
   @Prop() value: number;
   @Prop() max: number;
   @Prop() locale: string;
diff --git a/packages/web-component-library-stencil/src/components/page-content.tsx b/packages/web-component-library-stencil/src/components/page-content.tsx
index 3c934c84f62..ccaa3afca4f 100644
--- a/packages/web-component-library-stencil/src/components/page-content.tsx
+++ b/packages/web-component-library-stencil/src/components/page-content.tsx
@@ -11,7 +11,7 @@ import { Component, h } from '@stencil/core';
   styleUrl: 'page-content.scss',
   shadow: true,
 })
-export class Page {
+export class PageContent {
   render() {
     return (
       <div class="utrecht-page-content">
diff --git a/packages/web-component-library-stencil/src/components/surface.tsx b/packages/web-component-library-stencil/src/components/surface.tsx
index ffa587bc97e..13e9276c08c 100644
--- a/packages/web-component-library-stencil/src/components/surface.tsx
+++ b/packages/web-component-library-stencil/src/components/surface.tsx
@@ -11,7 +11,7 @@ import { Component, h } from '@stencil/core';
   styleUrl: 'surface.scss',
   shadow: true,
 })
-export class Code {
+export class Surface {
   render() {
     return (
       <div class="utrecht-surface">