diff --git a/CMake/VTKmWrappers.cmake b/CMake/VTKmWrappers.cmake
index 38956ac4d..613faa2c4 100644
--- a/CMake/VTKmWrappers.cmake
+++ b/CMake/VTKmWrappers.cmake
@@ -517,12 +517,9 @@ function(vtkm_library)
     if(NOT lib_name STREQUAL vtkm_module_current)
       # We do want each library to be in its own module. (VTK's module allows you to declare
       # multiple libraries per module. We may want that in the future, but right now we should
-      # not need it.) Right now we have one exception: vtkm_filter_extra inside of the
-      # vtkm_filter_core module. We are in the process of moving the filters to the new filter
-      # structure, and when that is done, vtkm_filter_extra should go away. But it is complex
-      # and will take some time. When that is done, perhaps this should be a stronger message
-      # (either a warning or error).
-      message("Library name `${lib_name}` does not match module name `${vtkm_module_current}`")
+      # not need it.)
+      message(FATAL_ERROR
+        "Library name `${lib_name}` does not match module name `${vtkm_module_current}`")
     endif()
     vtkm_module_get_property(depends ${vtkm_module_current} DEPENDS)
     vtkm_module_get_property(private_depends ${vtkm_module_current} PRIVATE_DEPENDS)
diff --git a/benchmarking/vtkm.module b/benchmarking/vtkm.module
index 74ad68e20..96ad0840e 100644
--- a/benchmarking/vtkm.module
+++ b/benchmarking/vtkm.module
@@ -16,5 +16,4 @@ DEPENDS
   vtkm_source
 OPTIONAL_DEPENDS
   vtkm_rendering
-  vtkm_filter_extra   # Hack for non-module library that should go away.
 NO_TESTING
diff --git a/vtkm/filter/vtkm.module b/vtkm/filter/vtkm.module
index c21efe22b..bba926f7a 100644
--- a/vtkm/filter/vtkm.module
+++ b/vtkm/filter/vtkm.module
@@ -9,9 +9,6 @@ TEST_DEPENDS
   vtkm_filter
   vtkm_io
   vtkm_source
-  # The following depend is only for UnitTestContourTreeUniformDistributedFilter.
-  # This dependency should be removed when that test is moved to its own library.
-  vtkm_filter_scalar_toplogy
 TEST_OPTIONAL_DEPENDS
   vtkm_rendering
   vtkm_rendering_testing