diff --git a/Imaging/Hybrid/CMakeLists.txt b/Imaging/Hybrid/CMakeLists.txt
index 25a3bc9c38c764dc3b5c0295497e4e5a4cf418b0..ed14944774ca72136ec836b5272fb9508fa98997 100644
--- a/Imaging/Hybrid/CMakeLists.txt
+++ b/Imaging/Hybrid/CMakeLists.txt
@@ -1,18 +1,18 @@
-set(Module_SRCS
-  vtkBooleanTexture.cxx
-  vtkCheckerboardSplatter.cxx
-  vtkFastSplatter.cxx
-  vtkGaussianSplatter.cxx
-  vtkImageCursor3D.cxx
-  vtkImageRectilinearWipe.cxx
-  vtkImageToPoints.cxx
-  vtkPointLoad.cxx
-  vtkSampleFunction.cxx
-  vtkShepardMethod.cxx
-  vtkSliceCubes.cxx
-  vtkSurfaceReconstructionFilter.cxx
-  vtkTriangularTexture.cxx
-  vtkVoxelModeller.cxx
-  )
+set(classes
+  vtkBooleanTexture
+  vtkCheckerboardSplatter
+  vtkFastSplatter
+  vtkGaussianSplatter
+  vtkImageCursor3D
+  vtkImageRectilinearWipe
+  vtkImageToPoints
+  vtkPointLoad
+  vtkSampleFunction
+  vtkShepardMethod
+  vtkSliceCubes
+  vtkSurfaceReconstructionFilter
+  vtkTriangularTexture
+  vtkVoxelModeller)
 
-vtk_module_library(${vtk-module} ${Module_SRCS})
+vtk_module_add_module(VTK::ImagingHybrid
+  CLASSES ${classes})
diff --git a/Imaging/Hybrid/Testing/CMakeLists.txt b/Imaging/Hybrid/Testing/CMakeLists.txt
index aabac3feeebccac16370d1198c62a60ceab26bad..3b920c6d55eecb522455b7aae679f5ff714dbdf5 100644
--- a/Imaging/Hybrid/Testing/CMakeLists.txt
+++ b/Imaging/Hybrid/Testing/CMakeLists.txt
@@ -1,3 +1,6 @@
+vtk_module_test_data(
+  Data/headsq/,REGEX:.*)
+
 add_subdirectory(Cxx)
 
 if (VTK_WRAP_PYTHON)
diff --git a/Imaging/Hybrid/module.cmake b/Imaging/Hybrid/module.cmake
deleted file mode 100644
index f4c7d71a3c2254d1d8d5ec45c7ef21aaa70aaa23..0000000000000000000000000000000000000000
--- a/Imaging/Hybrid/module.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-vtk_module(vtkImagingHybrid
-  GROUPS
-    Imaging
-    StandAlone
-  TEST_DEPENDS
-    vtkTestingCore
-    vtkCommonCore
-    vtkCommonDataModel
-    vtkImagingStencil
-    vtkRenderingOpenGL2
-    vtkTestingRendering
-    vtkInteractionStyle
-  DEPENDS
-    vtkCommonCore
-    vtkCommonExecutionModel
-  PRIVATE_DEPENDS
-    vtkCommonDataModel
-    vtkIOImage
-    vtkImagingCore
-  )
diff --git a/Imaging/Hybrid/vtk.module b/Imaging/Hybrid/vtk.module
new file mode 100644
index 0000000000000000000000000000000000000000..f22f46b534941b4dfb2f6974f689984684d5a2da
--- /dev/null
+++ b/Imaging/Hybrid/vtk.module
@@ -0,0 +1,24 @@
+NAME
+  VTK::ImagingHybrid
+LIBRARY_NAME
+  vtkImagingHybrid
+GROUPS
+  Imaging
+  StandAlone
+DEPENDS
+  VTK::CommonCore
+  VTK::CommonExecutionModel
+PRIVATE_DEPENDS
+  VTK::CommonDataModel
+  VTK::IOImage
+  VTK::ImagingCore
+TEST_DEPENDS
+  VTK::CommonCore
+  VTK::CommonDataModel
+  VTK::FiltersSources
+  VTK::IOImage
+  VTK::ImagingStencil
+  VTK::InteractionStyle
+  VTK::RenderingOpenGL2
+  VTK::TestingCore
+  VTK::TestingRendering