diff --git a/Src/ILGPU.Algorithms.Tests.CPU/CPUMetaOptimizerTests.cs b/Src/ILGPU.Algorithms.Tests.CPU/CPUSGOOptimizerTests.cs
similarity index 97%
rename from Src/ILGPU.Algorithms.Tests.CPU/CPUMetaOptimizerTests.cs
rename to Src/ILGPU.Algorithms.Tests.CPU/CPUSGOOptimizerTests.cs
index d66ac0f2c0..a59625641c 100644
--- a/Src/ILGPU.Algorithms.Tests.CPU/CPUMetaOptimizerTests.cs
+++ b/Src/ILGPU.Algorithms.Tests.CPU/CPUSGOOptimizerTests.cs
@@ -1,9 +1,9 @@
 // ---------------------------------------------------------------------------------------
 //                                   ILGPU Algorithms
-//                           Copyright (c) 2023 ILGPU Project
+//                        Copyright (c) 2023-2024 ILGPU Project
 //                                    www.ilgpu.net
 //
-// File: CPUMetaOptimizerTests.cs
+// File: CPUSGOOptimizerTests.cs
 //
 // This file is part of ILGPU and is distributed under the University of Illinois Open
 // Source License. See LICENSE.txt for details.
@@ -24,9 +24,9 @@ namespace ILGPU.Algorithms.Tests.CPU
 {
     /// <summary>
     /// Contains tests to verify the functionality of the CPU-specialized
-    /// <see cref="MetaOptimizer{T,TEvalType}"/> class.
+    /// <see cref="SGOOptimizer{T,TEvalType}"/> class.
     /// </summary>
-    public class CPUMetaOptimizerTests
+    public class CPUSGOOptimizerTests
     {
         #region CPU Functions
 
@@ -190,7 +190,7 @@ public void MetaOptimizationScalar<TObjective>(
             int numDimensions = objective.LowerBounds.Length;
             var random = new System.Random(13377331);
 
-            using var optimizer = MetaOptimizer.CreateScalar<
+            using var optimizer = SGOOptimizer.CreateScalar<
                 float,
                 float,
                 RandomRanges.RandomRangeFloatProvider<XorShift64Star>>(
@@ -232,7 +232,7 @@ public void MetaOptimizationVectorized<TObjective>(
             int numDimensions = objective.LowerBounds.Length;
             var random = new System.Random(13377331);
 
-            using var optimizer = MetaOptimizer.CreateVectorized<
+            using var optimizer = SGOOptimizer.CreateVectorized<
                 float,
                 float,
                 RandomRanges.RandomRangeFloatProvider<XorShift64Star>>(
@@ -276,7 +276,7 @@ public void MetaOptimizationScalarRaw<TObjective>(
             int numDimensions = objective.LowerBounds.Length;
             var random = new System.Random(13377331);
 
-            using var optimizer = MetaOptimizer.CreateScalar<
+            using var optimizer = SGOOptimizer.CreateScalar<
                 float,
                 float,
                 RandomRanges.RandomRangeFloatProvider<XorShift64Star>>(