diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index 9ee379acc5..e8cd8846bf 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -12,7 +12,7 @@ if( KICAD_SCRIPTING_MODULES )
 
 endif()
 
-add_subdirectory( geometry )
+add_subdirectory( shape_poly_set_refactor )
 add_subdirectory( pcb_test_window )
 add_subdirectory( polygon_triangulation )
 add_subdirectory( polygon_generator )
\ No newline at end of file
diff --git a/qa/geometry/CMakeLists.txt b/qa/shape_poly_set_refactor/CMakeLists.txt
similarity index 86%
rename from qa/geometry/CMakeLists.txt
rename to qa/shape_poly_set_refactor/CMakeLists.txt
index 19ca8b91ba..3100328b55 100644
--- a/qa/geometry/CMakeLists.txt
+++ b/qa/shape_poly_set_refactor/CMakeLists.txt
@@ -26,7 +26,7 @@ find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc R
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
-add_executable(qa_geometry
+add_executable( qa_shape_poly_set_refactor
     test_module.cpp
     test_chamfer_fillet.cpp
     test_collision.cpp
@@ -42,7 +42,7 @@ include_directories(
     ${Boost_INCLUDE_DIR}
 )
 
-target_link_libraries(qa_geometry
+target_link_libraries( qa_shape_poly_set_refactor
     polygon
     common
     polygon
@@ -53,8 +53,8 @@ target_link_libraries(qa_geometry
     ${wxWidgets_LIBRARIES}
 )
 
-add_dependencies( qa_geometry pcbnew )
+add_dependencies( qa_shape_poly_set_refactor pcbnew )
 
-add_test( NAME geometry
-    COMMAND qa_geometry --run_test=!ChamferFillet/Fillet
-)
\ No newline at end of file
+add_test( NAME shape_poly_set_refactor
+    COMMAND qa_shape_poly_set_refactor --run_test=!ChamferFillet/Fillet
+)
diff --git a/qa/geometry/test_chamfer_fillet.cpp b/qa/shape_poly_set_refactor/test_chamfer_fillet.cpp
similarity index 100%
rename from qa/geometry/test_chamfer_fillet.cpp
rename to qa/shape_poly_set_refactor/test_chamfer_fillet.cpp
diff --git a/qa/geometry/test_collision.cpp b/qa/shape_poly_set_refactor/test_collision.cpp
similarity index 100%
rename from qa/geometry/test_collision.cpp
rename to qa/shape_poly_set_refactor/test_collision.cpp
diff --git a/qa/geometry/test_iterator.cpp b/qa/shape_poly_set_refactor/test_iterator.cpp
similarity index 100%
rename from qa/geometry/test_iterator.cpp
rename to qa/shape_poly_set_refactor/test_iterator.cpp
diff --git a/qa/geometry/test_module.cpp b/qa/shape_poly_set_refactor/test_module.cpp
similarity index 100%
rename from qa/geometry/test_module.cpp
rename to qa/shape_poly_set_refactor/test_module.cpp
diff --git a/qa/geometry/test_segment.cpp b/qa/shape_poly_set_refactor/test_segment.cpp
similarity index 100%
rename from qa/geometry/test_segment.cpp
rename to qa/shape_poly_set_refactor/test_segment.cpp