diff --git a/mlir/test/Conversion/LoopsToGPU/imperfect_2D.mlir b/mlir/test/Conversion/SCFToGPU/imperfect_2D.mlir
rename from mlir/test/Conversion/LoopsToGPU/imperfect_2D.mlir
rename to mlir/test/Conversion/SCFToGPU/imperfect_2D.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/imperfect_3D.mlir b/mlir/test/Conversion/SCFToGPU/imperfect_3D.mlir
rename from mlir/test/Conversion/LoopsToGPU/imperfect_3D.mlir
rename to mlir/test/Conversion/SCFToGPU/imperfect_3D.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/imperfect_4D.mlir b/mlir/test/Conversion/SCFToGPU/imperfect_4D.mlir
rename from mlir/test/Conversion/LoopsToGPU/imperfect_4D.mlir
rename to mlir/test/Conversion/SCFToGPU/imperfect_4D.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/imperfect_linalg.mlir b/mlir/test/Conversion/SCFToGPU/imperfect_linalg.mlir
rename from mlir/test/Conversion/LoopsToGPU/imperfect_linalg.mlir
rename to mlir/test/Conversion/SCFToGPU/imperfect_linalg.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/linalg_to_gpu.mlir b/mlir/test/Conversion/SCFToGPU/linalg_to_gpu.mlir
rename from mlir/test/Conversion/LoopsToGPU/linalg_to_gpu.mlir
rename to mlir/test/Conversion/SCFToGPU/linalg_to_gpu.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/no_blocks_no_threads.mlir b/mlir/test/Conversion/SCFToGPU/no_blocks_no_threads.mlir
rename from mlir/test/Conversion/LoopsToGPU/no_blocks_no_threads.mlir
rename to mlir/test/Conversion/SCFToGPU/no_blocks_no_threads.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/parallel_loop.mlir b/mlir/test/Conversion/SCFToGPU/parallel_loop.mlir
rename from mlir/test/Conversion/LoopsToGPU/parallel_loop.mlir
rename to mlir/test/Conversion/SCFToGPU/parallel_loop.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/perfect_1D_setlaunch.mlir b/mlir/test/Conversion/SCFToGPU/perfect_1D_setlaunch.mlir
rename from mlir/test/Conversion/LoopsToGPU/perfect_1D_setlaunch.mlir
rename to mlir/test/Conversion/SCFToGPU/perfect_1D_setlaunch.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/step_one.mlir b/mlir/test/Conversion/SCFToGPU/step_one.mlir
rename from mlir/test/Conversion/LoopsToGPU/step_one.mlir
rename to mlir/test/Conversion/SCFToGPU/step_one.mlir
diff --git a/mlir/test/Conversion/LoopsToGPU/step_positive.mlir b/mlir/test/Conversion/SCFToGPU/step_positive.mlir
rename from mlir/test/Conversion/LoopsToGPU/step_positive.mlir
rename to mlir/test/Conversion/SCFToGPU/step_positive.mlir
diff --git a/mlir/test/Conversion/convert-to-cfg.mlir b/mlir/test/Conversion/SCFToStandard/convert-to-cfg.mlir
rename from mlir/test/Conversion/convert-to-cfg.mlir
rename to mlir/test/Conversion/SCFToStandard/convert-to-cfg.mlir
diff --git a/mlir/test/Conversion/VectorToLoops/vector-to-loops.mlir b/mlir/test/Conversion/VectorToSCF/vector-to-loops.mlir
rename from mlir/test/Conversion/VectorToLoops/vector-to-loops.mlir
rename to mlir/test/Conversion/VectorToSCF/vector-to-loops.mlir