diff --git a/base/src/main/java/de/staropensource/engine/base/implementable/ShortcodeParser.java b/base/src/main/java/de/staropensource/engine/base/implementable/ShortcodeParser.java
index 93502ed..fcf83a6 100644
--- a/base/src/main/java/de/staropensource/engine/base/implementable/ShortcodeParser.java
+++ b/base/src/main/java/de/staropensource/engine/base/implementable/ShortcodeParser.java
@@ -29,7 +29,7 @@ import java.util.LinkedList;
 import java.util.Locale;
 
 /**
- * Base class for implementing a shortcode converter.
+ * Base class for implementing a shortcode parser.
  * <p>
  * This class parses a string and converts it into a list of
  * components, which can then be in turn be converted to something
diff --git a/base/src/main/java/de/staropensource/engine/base/implementation/logging/PlainLoggingAdapter.java b/base/src/main/java/de/staropensource/engine/base/implementation/logging/PlainLoggingAdapter.java
index 48029fa..f16294e 100644
--- a/base/src/main/java/de/staropensource/engine/base/implementation/logging/PlainLoggingAdapter.java
+++ b/base/src/main/java/de/staropensource/engine/base/implementation/logging/PlainLoggingAdapter.java
@@ -23,9 +23,8 @@ import de.staropensource.engine.base.EngineConfiguration;
 import de.staropensource.engine.base.implementable.LoggingAdapter;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.base.type.logging.LogLevel;
-import de.staropensource.engine.base.implementation.shortcode.EmptyShortcodeConverter;
+import de.staropensource.engine.base.implementation.shortcode.EmptyShortcodeParser;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Prints log messages to the console, without any fancy colors or formatting.
@@ -45,7 +44,7 @@ public class PlainLoggingAdapter implements LoggingAdapter {
     /** {@inheritDoc} */
     @Override
     public void print(@NotNull LogLevel level, @NotNull StackTraceElement issuer, @NotNull String message, @NotNull String format) {
-        format = new EmptyShortcodeConverter(format, true).getClean();
+        format = new EmptyShortcodeParser(format, true).getClean();
         if (level == LogLevel.ERROR || level == LogLevel.CRASH)
             if (EngineConfiguration.getInstance() != null && EngineConfiguration.getInstance().isLogForceStandardOutput())
                 System.out.println(format);
diff --git a/base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeConverter.java b/base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeParser.java
similarity index 88%
rename from base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeConverter.java
rename to base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeParser.java
index 20ccc58..3161b01 100644
--- a/base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeConverter.java
+++ b/base/src/main/java/de/staropensource/engine/base/implementation/shortcode/EmptyShortcodeParser.java
@@ -27,18 +27,18 @@ import org.jetbrains.annotations.NotNull;
  * Cleans the string of any tags.
  *
  * @see ShortcodeParser
- * @since v1-alpha1
+ * @since v1-alpha8
  */
-public final class EmptyShortcodeConverter extends ShortcodeParser {
+public final class EmptyShortcodeParser extends ShortcodeParser {
     /**
      * Creates and initializes an instance of this class.
      *
      * @param string               string to parse
      * @param ignoreInvalidEscapes if {@code true}, will ignore and treat invalid escapes as text
      * @throws ParserException on error
-     * @since v1-alpha1
+     * @since v1-alpha8
      */
-    public EmptyShortcodeConverter(@NotNull String string, boolean ignoreInvalidEscapes) throws ParserException {
+    public EmptyShortcodeParser(@NotNull String string, boolean ignoreInvalidEscapes) throws ParserException {
         super(string, ignoreInvalidEscapes);
     }
 
@@ -46,7 +46,7 @@ public final class EmptyShortcodeConverter extends ShortcodeParser {
      * Returns the parsed string without any tags.
      *
      * @return cleaned input string
-     * @since v1-alpha1
+     * @since v1-alpha8
      */
     public @NotNull String getClean() {
         StringBuilder output = new StringBuilder();
diff --git a/base/src/main/java/de/staropensource/engine/base/logging/backend/Processor.java b/base/src/main/java/de/staropensource/engine/base/logging/backend/Processor.java
index 0443c04..f220680 100644
--- a/base/src/main/java/de/staropensource/engine/base/logging/backend/Processor.java
+++ b/base/src/main/java/de/staropensource/engine/base/logging/backend/Processor.java
@@ -20,7 +20,7 @@
 package de.staropensource.engine.base.logging.backend;
 
 import de.staropensource.engine.base.EngineConfiguration;
-import de.staropensource.engine.base.implementation.shortcode.EmptyShortcodeConverter;
+import de.staropensource.engine.base.implementation.shortcode.EmptyShortcodeParser;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.base.logging.backend.async.LoggingQueue;
 import de.staropensource.engine.base.type.logging.LogLevel;
@@ -349,7 +349,7 @@ public final class Processor {
         builder.append(sanitizeFormat(handlePlaceholders(
                 message.replace(
                         "\n",
-                        "\n" + " ".repeat(new EmptyShortcodeConverter(builder.toString(), true).getClean().length())
+                        "\n" + " ".repeat(new EmptyShortcodeParser(builder.toString(), true).getClean().length())
                 )
         )));
     }