diff --git a/bench/benchmarks/remove_paint_state.js b/bench/benchmarks/remove_paint_state.js
index d4a04394f1c..a67f9b32f6a 100644
--- a/bench/benchmarks/remove_paint_state.js
+++ b/bench/benchmarks/remove_paint_state.js
@@ -68,7 +68,7 @@ class RemovePaintState extends Benchmark {
     }
 }
 
-class propertyLevelRemove extends RemovePaintState {
+class PropertyLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
@@ -82,7 +82,7 @@ class propertyLevelRemove extends RemovePaintState {
     }
 }
 
-class featureLevelRemove extends RemovePaintState {
+class FeatureLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
@@ -96,7 +96,7 @@ class featureLevelRemove extends RemovePaintState {
     }
 }
 
-class sourceLevelRemove extends RemovePaintState {
+class SourceLevelRemove extends RemovePaintState {
     bench() {
 
         for (let i = 0; i < this.numFeatures; i += 50) {
@@ -111,7 +111,7 @@ class sourceLevelRemove extends RemovePaintState {
 }
 
 export default [
-    propertyLevelRemove,
-    featureLevelRemove,
-    sourceLevelRemove
+    PropertyLevelRemove,
+    FeatureLevelRemove,
+    SourceLevelRemove
 ];
diff --git a/bench/versions/benchmarks.js b/bench/versions/benchmarks.js
index 5729ee2eae3..f431bafd0ba 100644
--- a/bench/versions/benchmarks.js
+++ b/bench/versions/benchmarks.js
@@ -22,7 +22,7 @@ import SymbolLayout from '../benchmarks/symbol_layout';
 import WorkerTransfer from '../benchmarks/worker_transfer';
 import Paint from '../benchmarks/paint';
 import PaintStates from '../benchmarks/paint_states';
-import RemovePaintState from '../benchmarks/remove_paint_state';
+import RemovePaintStateBenchmarks from '../benchmarks/remove_paint_state';
 import LayerBenchmarks from '../benchmarks/layers';
 import Load from '../benchmarks/map_load';
 import Validate from '../benchmarks/style_validate';
@@ -47,7 +47,7 @@ register(new StyleLayerCreate(style));
 ExpressionBenchmarks.forEach((Bench) => register(new Bench(style)));
 register(new WorkerTransfer(style));
 register(new PaintStates(center));
-register(new RemovePaintState(center));
+RemovePaintStateBenchmarks.forEach((Bench) => register(new Bench(center)));
 LayerBenchmarks.forEach((Bench) => register(new Bench()));
 register(new Load());
 register(new LayoutDDS());