diff --git a/benchmarks/java/src/net/i2p/crypto/AESBenchmarks.java b/benchmarks/java/src/net/i2p/crypto/AESBench.java
similarity index 95%
rename from benchmarks/java/src/net/i2p/crypto/AESBenchmarks.java
rename to benchmarks/java/src/net/i2p/crypto/AESBench.java
index 160628fca55a339d774303af9f629839059351a6..b32df90249b94b07c474971f69de0d7c3a53f632 100644
--- a/benchmarks/java/src/net/i2p/crypto/AESBenchmarks.java
+++ b/benchmarks/java/src/net/i2p/crypto/AESBench.java
@@ -28,7 +28,7 @@ import net.i2p.data.SessionKey;
 @Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Fork(1)
 @State(Scope.Benchmark)
-public class AESBenchmarks {
+public class AESBench {
     I2PAppContext ctx = I2PAppContext.getGlobalContext();
     SessionKey key;
     CryptixAESEngine aes;
@@ -62,7 +62,7 @@ public class AESBenchmarks {
 
     public static void main(String args[]) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(AESBenchmarks.class.getSimpleName())
+                .include(AESBench.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
diff --git a/benchmarks/java/src/net/i2p/crypto/ElGamalBenchmarks.java b/benchmarks/java/src/net/i2p/crypto/ElGamalBench.java
similarity index 95%
rename from benchmarks/java/src/net/i2p/crypto/ElGamalBenchmarks.java
rename to benchmarks/java/src/net/i2p/crypto/ElGamalBench.java
index c44f30f5da1167567ff35e39a6396ae7af257322..14a8bde22b028af30cefff0439525e5acebb737b 100644
--- a/benchmarks/java/src/net/i2p/crypto/ElGamalBenchmarks.java
+++ b/benchmarks/java/src/net/i2p/crypto/ElGamalBench.java
@@ -28,7 +28,7 @@ import net.i2p.data.PublicKey;
 @Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Fork(1)
 @State(Scope.Benchmark)
-public class ElGamalBenchmarks {
+public class ElGamalBench {
     I2PAppContext ctx = I2PAppContext.getGlobalContext();
     PublicKey pubkey;
     PrivateKey privkey;
@@ -62,7 +62,7 @@ public class ElGamalBenchmarks {
 
     public static void main(String args[]) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(ElGamalBenchmarks.class.getSimpleName())
+                .include(ElGamalBench.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
diff --git a/benchmarks/java/src/net/i2p/crypto/SHA256Benchmarks.java b/benchmarks/java/src/net/i2p/crypto/SHA256Bench.java
similarity index 95%
rename from benchmarks/java/src/net/i2p/crypto/SHA256Benchmarks.java
rename to benchmarks/java/src/net/i2p/crypto/SHA256Bench.java
index 09750814b6db0b8b2c52e4acd7079b413a7ec691..00a57c0ed848e8324ba3a3f607e57b6c089179a2 100644
--- a/benchmarks/java/src/net/i2p/crypto/SHA256Benchmarks.java
+++ b/benchmarks/java/src/net/i2p/crypto/SHA256Bench.java
@@ -49,7 +49,7 @@ import org.openjdk.jmh.runner.options.OptionsBuilder;
 @Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Fork(1)
 @State(Scope.Benchmark)
-public class SHA256Benchmarks {
+public class SHA256Bench {
     MessageDigest md;
 
     @Param({"40", "387", "10240"})
@@ -73,7 +73,7 @@ public class SHA256Benchmarks {
 
     public static void main(String args[]) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(SHA256Benchmarks.class.getSimpleName())
+                .include(SHA256Bench.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();