diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4Test.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilterTest.java
similarity index 90%
rename from org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4Test.java
rename to org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilterTest.java
index 8e30488bf6..494d8b0553 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4Test.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilterTest.java
@@ -19,9 +19,9 @@
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-public class KotlinUnsafeCastOperatorFilter1_4Test extends FilterTestBase {
+public class Kotlin14UnsafeCastOperatorFilterTest extends FilterTestBase {
 
-	private final KotlinUnsafeCastOperatorFilter1_4 filter = new KotlinUnsafeCastOperatorFilter1_4();
+	private final Kotlin14UnsafeCastOperatorFilter filter = new Kotlin14UnsafeCastOperatorFilter();
 
 	private final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, 0,
 			"name", "()V", null, null);
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Filters.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Filters.java
index 49c163f5cf..4be8ca5f6e 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Filters.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Filters.java
@@ -47,7 +47,7 @@ public static IFilter all() {
 				new KotlinNotNullOperatorFilter(),
 				new KotlinDefaultArgumentsFilter(), new KotlinInlineFilter(),
 				new KotlinCoroutineFilter(), new KotlinDefaultMethodsFilter(),
-				new KotlinUnsafeCastOperatorFilter1_4());
+				new Kotlin14UnsafeCastOperatorFilter());
 	}
 
 	private Filters(final IFilter... filters) {
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilter.java
similarity index 92%
rename from org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4.java
rename to org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilter.java
index 87003ebb38..1a9af29fc4 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter1_4.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/Kotlin14UnsafeCastOperatorFilter.java
@@ -22,14 +22,14 @@
  * Filters branch in bytecode that Kotlin compiler generates for "unsafe" cast
  * operator for Kotlin 1.4
  */
-public class KotlinUnsafeCastOperatorFilter1_4 implements IFilter {
+public class Kotlin14UnsafeCastOperatorFilter implements IFilter {
 
 	private static final String KOTLIN_1_4_TYPE_CAST_EXCEPTION = "java/lang/NullPointerException";
 
 	@Override
 	public void filter(MethodNode methodNode, IFilterContext context,
 			IFilterOutput output) {
-		final KotlinUnsafeCastOperatorFilter1_4.Matcher matcher = new KotlinUnsafeCastOperatorFilter1_4.Matcher();
+		final Kotlin14UnsafeCastOperatorFilter.Matcher matcher = new Kotlin14UnsafeCastOperatorFilter.Matcher();
 		for (final AbstractInsnNode i : methodNode.instructions) {
 			matcher.match(i, output);
 		}