diff --git a/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java b/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java
index 66a3dc8a21..fbf84b57ae 100644
--- a/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java
+++ b/src/java/org/apache/cassandra/tcm/ownership/ReplicaGroups.java
@@ -138,7 +138,7 @@ public class ReplicaGroups
         int pos = ordering.binarySearchAsymmetric(ranges, token, AsymmetricOrdering.Op.CEIL);
         if (pos >= 0 && pos < endpoints.size())
             return endpoints.get(pos);
-        throw new IllegalStateException("Could not find range for token " + token + " in PlacementForRange: " + this);
+        throw new IllegalStateException("Could not find range for token " + token + " in ReplicaGroups: " + this);
     }
 
     public VersionedEndpoints.ForToken forToken(Token token)
diff --git a/test/microbench/org/apache/cassandra/test/microbench/PlacementForRangeBench.java b/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java
similarity index 92%
rename from test/microbench/org/apache/cassandra/test/microbench/PlacementForRangeBench.java
rename to test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java
index 407559509c..7de7a8ef54 100644
--- a/test/microbench/org/apache/cassandra/test/microbench/PlacementForRangeBench.java
+++ b/test/microbench/org/apache/cassandra/test/microbench/ReplicaGroupsBench.java
@@ -65,15 +65,15 @@ import org.openjdk.jmh.runner.options.OptionsBuilder;
 @Fork(value = 1)
 @Warmup(iterations = 5, timeUnit = TimeUnit.MILLISECONDS, time = 5000)
 @Measurement(iterations = 5, timeUnit = TimeUnit.MILLISECONDS, time = 5000)
-public class PlacementForRangeBench
+public class ReplicaGroupsBench
 {
     static Token [] queryTokens = new Token[5000];
     static Random random = new Random(1);
-    static ReplicaGroups pfr;
+    static ReplicaGroups replicaGroups;
 /*
-new: PlacementForRangeBench.bench  avgt    5  0,317 ± 0,037  ms/op
+new: ReplicaGroupBench.bench  avgt    5  0,317 ± 0,037  ms/op
 
-old: PlacementForRangeBench.bench  avgt    5  10,187 ± 0,040  ms/op
+old: ReplicaGroupBench.bench  avgt    5  10,187 ± 0,040  ms/op
 
  */
     @Setup(Level.Trial)
@@ -85,14 +85,14 @@ old: PlacementForRangeBench.bench  avgt    5  10,187 ± 0,040  ms/op
             queryTokens[i] = Murmur3Partitioner.instance.getRandomToken(random);
         Keyspaces keyspaces = fakeKeyspaces(6);
         ReplicationParams params = keyspaces.get("pfrbench").get().params.replication;
-        pfr = new UniformRangePlacement().calculatePlacements(Epoch.FIRST, fakeMetadata(nodecount), keyspaces).get(params).reads;
+        replicaGroups = new UniformRangePlacement().calculatePlacements(Epoch.FIRST, fakeMetadata(nodecount), keyspaces).get(params).reads;
     }
 
     @Benchmark
     public void bench()
     {
         for (Token t : queryTokens)
-            pfr.forRange(t);
+            replicaGroups.forRange(t);
     }
 
     public ClusterMetadata fakeMetadata(int nodeCount) throws UnknownHostException
@@ -131,7 +131,7 @@ old: PlacementForRangeBench.bench  avgt    5  10,187 ± 0,040  ms/op
     public static void main(String[] args) throws RunnerException
     {
         Options options = new OptionsBuilder()
-                          .include(PlacementForRangeBench.class.getSimpleName())
+                          .include(ReplicaGroupsBench.class.getSimpleName())
                           .build();
         new Runner(options).run();
     }