diff --git a/Wrapping/Generators/Python/CMakeLists.txt b/Wrapping/Generators/Python/CMakeLists.txt
index 29699ef1d03..eba5b2d0a1f 100644
--- a/Wrapping/Generators/Python/CMakeLists.txt
+++ b/Wrapping/Generators/Python/CMakeLists.txt
@@ -334,8 +334,8 @@ macro(itk_end_wrap_submodule_python group_name)
   # create the swig interface for all the groups in the module
   set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${base_name}.i")
   set(lib ${base_name}Python)
-  set(python_file "${ITK_PYTHON_PACKAGE_DIR}/${lib}.py")
-  set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${base_name}Python.cpp")
+  set(python_file "${ITK_PYTHON_PACKAGE_DIR}/${base_name}.py")
+  set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${lib}.cpp")
 
   # create the python customization for that wrap_*.cmake file.
   configure_file("${ITK_WRAP_PYTHON_SOURCE_DIR}/module_ext.i.in"
diff --git a/Wrapping/TypedefMacros.cmake b/Wrapping/TypedefMacros.cmake
index 0288aa93a17..8ebc03b1943 100644
--- a/Wrapping/TypedefMacros.cmake
+++ b/Wrapping/TypedefMacros.cmake
@@ -416,7 +416,7 @@ ${DO_NOT_WAIT_FOR_THREADS_DECLS}
     set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
     set(lib ${WRAPPER_LIBRARY_NAME}Python)
     set(python_file "${ITK_PYTHON_PACKAGE_DIR}/${lib}.py")
-    set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_LIBRARY_NAME}Python.cpp")
+    set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${lib}.cpp")
 
     # if this is for an external library, let the user add extra swig args
     if(EXTERNAL_WRAP_ITK_PROJECT)