diff --git a/buffer/src/test/java/io/netty/buffer/b2/BBufTest.java b/buffer/src/test/java/io/netty/buffer/b2/BufTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/b2/BBufTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/BufTest.java
index 899e65d..46effe8 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/BBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/BufTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.SynchronousQueue;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-public abstract class BBufTest {
+public abstract class BufTest {
     protected abstract Allocator createAllocator();
 
     private Allocator allocator;
diff --git a/buffer/src/test/java/io/netty/buffer/b2/Codegen.java b/buffer/src/test/java/io/netty/buffer/b2/Codegen.java
index c65eede..66c2f9b 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/Codegen.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/Codegen.java
@@ -571,7 +571,7 @@ public final class Codegen {
     public static void main(String[] args) throws Exception {
         generateCodeInline(Path.of("buffer/src/main/java/io/netty/buffer/b2/Buf.java"));
         generateCodeInline(Path.of("buffer/src/main/java/io/netty/buffer/b2/BBuf.java"));
-        generateCodeInline(Path.of("buffer/src/test/java/io/netty/buffer/b2/BBufTest.java"));
+        generateCodeInline(Path.of("buffer/src/test/java/io/netty/buffer/b2/BufTest.java"));
     }
 
     private static void generateCodeInline(Path path) throws IOException {
diff --git a/buffer/src/test/java/io/netty/buffer/b2/DirectBBufTest.java b/buffer/src/test/java/io/netty/buffer/b2/DirectBufTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/b2/DirectBBufTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/DirectBufTest.java
index 79af35d..519cf92 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/DirectBBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/DirectBufTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class DirectBBufTest extends BBufTest {
+public class DirectBufTest extends BufTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.direct();
diff --git a/buffer/src/test/java/io/netty/buffer/b2/DirectBBufWithCleanerTest.java b/buffer/src/test/java/io/netty/buffer/b2/DirectBufWithCleanerTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/b2/DirectBBufWithCleanerTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/DirectBufWithCleanerTest.java
index 8985e54..524b98c 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/DirectBBufWithCleanerTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/DirectBufWithCleanerTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-public class DirectBBufWithCleanerTest extends DirectBBufTest {
+public class DirectBufWithCleanerTest extends DirectBufTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.directWithCleaner();
diff --git a/buffer/src/test/java/io/netty/buffer/b2/HeapBBufTest.java b/buffer/src/test/java/io/netty/buffer/b2/HeapBufTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/b2/HeapBBufTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/HeapBufTest.java
index d19f877..1cb8540 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/HeapBBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/HeapBufTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class HeapBBufTest extends BBufTest {
+public class HeapBufTest extends BufTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.heap();
diff --git a/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufTest.java b/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufTest.java
similarity index 92%
rename from buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufTest.java
index ffa539d..d9cdf82 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufTest.java
@@ -15,7 +15,7 @@
  */
 package io.netty.buffer.b2;
 
-public class PooledDirectBBufTest extends DirectBBufTest {
+public class PooledDirectBufTest extends DirectBufTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.pooledDirect();
diff --git a/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufWithCleanerTest.java b/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufWithCleanerTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufWithCleanerTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufWithCleanerTest.java
index 6c4388f..e6c15bc 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBBufWithCleanerTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/PooledDirectBufWithCleanerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-public class PooledDirectBBufWithCleanerTest extends DirectBBufWithCleanerTest {
+public class PooledDirectBufWithCleanerTest extends DirectBufWithCleanerTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.pooledDirectWithCleaner();
diff --git a/buffer/src/test/java/io/netty/buffer/b2/PooledHeapBBufTest.java b/buffer/src/test/java/io/netty/buffer/b2/PooledHeapBufTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/b2/PooledHeapBBufTest.java
rename to buffer/src/test/java/io/netty/buffer/b2/PooledHeapBufTest.java
index 7a1e94f..0b9ce34 100644
--- a/buffer/src/test/java/io/netty/buffer/b2/PooledHeapBBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/b2/PooledHeapBufTest.java
@@ -15,7 +15,7 @@
  */
 package io.netty.buffer.b2;
 
-public class PooledHeapBBufTest extends HeapBBufTest {
+public class PooledHeapBufTest extends HeapBufTest {
     @Override
     protected Allocator createAllocator() {
         return Allocator.pooledHeap();