diff --git a/packages/parser/src/language/common/tokenBuilder.ts b/packages/parser/src/language/common/tokenBuilder.ts
index df1c3864a..d59249e19 100644
--- a/packages/parser/src/language/common/tokenBuilder.ts
+++ b/packages/parser/src/language/common/tokenBuilder.ts
@@ -3,7 +3,7 @@ import type { TokenType, TokenVocabulary } from 'chevrotain';
 
 import { DefaultTokenBuilder } from 'langium';
 
-export abstract class MermaidTokenBuilder extends DefaultTokenBuilder {
+export abstract class AbstractMermaidTokenBuilder extends DefaultTokenBuilder {
   private keywords: Set<string>;
 
   public constructor(keywords: string[]) {
@@ -57,4 +57,4 @@ export abstract class MermaidTokenBuilder extends DefaultTokenBuilder {
   }
 }
 
-export class CommonTokenBuilder extends MermaidTokenBuilder {}
+export class CommonTokenBuilder extends AbstractMermaidTokenBuilder {}
diff --git a/packages/parser/src/language/common/valueConverter.ts b/packages/parser/src/language/common/valueConverter.ts
index bc31ba714..624cc67a5 100644
--- a/packages/parser/src/language/common/valueConverter.ts
+++ b/packages/parser/src/language/common/valueConverter.ts
@@ -10,7 +10,7 @@ const rulesRegexes: Record<string, RegExp> = {
   TITLE: titleRegex,
 };
 
-export abstract class MermaidValueConverter extends DefaultValueConverter {
+export abstract class AbstractMermaidValueConverter extends DefaultValueConverter {
   /**
    * A method contains convert logic to be used by class.
    *
@@ -71,8 +71,8 @@ export abstract class MermaidValueConverter extends DefaultValueConverter {
   }
 }
 
-export class CommonValueConverter extends MermaidValueConverter {
-  protected runCustomConverter(
+export class CommonValueConverter extends AbstractMermaidValueConverter {
+  protected override runCustomConverter(
     _rule: GrammarAST.AbstractRule,
     _input: string,
     _cstNode: CstNode
diff --git a/packages/parser/src/language/info/tokenBuilder.ts b/packages/parser/src/language/info/tokenBuilder.ts
index 311d372e4..69ad0e689 100644
--- a/packages/parser/src/language/info/tokenBuilder.ts
+++ b/packages/parser/src/language/info/tokenBuilder.ts
@@ -1,6 +1,6 @@
-import { MermaidTokenBuilder } from '../common/index.js';
+import { AbstractMermaidTokenBuilder } from '../common/index.js';
 
-export class InfoTokenBuilder extends MermaidTokenBuilder {
+export class InfoTokenBuilder extends AbstractMermaidTokenBuilder {
   public constructor() {
     super(['info', 'showInfo']);
   }
diff --git a/packages/parser/src/language/pie/tokenBuilder.ts b/packages/parser/src/language/pie/tokenBuilder.ts
index b75cde187..85aecf96a 100644
--- a/packages/parser/src/language/pie/tokenBuilder.ts
+++ b/packages/parser/src/language/pie/tokenBuilder.ts
@@ -1,6 +1,6 @@
-import { MermaidTokenBuilder } from '../common/index.js';
+import { AbstractMermaidTokenBuilder } from '../common/index.js';
 
-export class PieTokenBuilder extends MermaidTokenBuilder {
+export class PieTokenBuilder extends AbstractMermaidTokenBuilder {
   public constructor() {
     super(['pie', 'showData']);
   }
diff --git a/packages/parser/src/language/pie/valueConverter.ts b/packages/parser/src/language/pie/valueConverter.ts
index 9215ef43c..b0ae18c0b 100644
--- a/packages/parser/src/language/pie/valueConverter.ts
+++ b/packages/parser/src/language/pie/valueConverter.ts
@@ -1,8 +1,8 @@
 import type { CstNode, GrammarAST, ValueType } from 'langium';
 
-import { MermaidValueConverter } from '../common/index.js';
+import { AbstractMermaidValueConverter } from '../common/index.js';
 
-export class PieValueConverter extends MermaidValueConverter {
+export class PieValueConverter extends AbstractMermaidValueConverter {
   protected runCustomConverter(
     rule: GrammarAST.AbstractRule,
     input: string,