diff --git a/Tests/Unit/PyBinding/CMakeLists.txt b/Tests/Unit/PyBinding/CMakeLists.txt
index 23b3c6c0165b260cb3ba2077a28928f58a1d3a79..7bd6cdaf77ca5eb06d0a0219b4c4a22d72996e05 100644
--- a/Tests/Unit/PyBinding/CMakeLists.txt
+++ b/Tests/Unit/PyBinding/CMakeLists.txt
@@ -16,7 +16,7 @@ target_include_directories(${test}
     ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include
     ${Python3_INCLUDE_DIRS}
     ${Python3_NumPy_INCLUDE_DIRS}
-    ${AUTO_DIR}
+    ${AUTO_WRAP_DIR}
 )
 
 target_link_libraries(${test} BornAgainSim gtest ${Python3_LIBRARIES})
diff --git a/cmake/BornAgain/Directories.cmake b/cmake/BornAgain/Directories.cmake
index fc970c2b63dd75185700ba49bf3289033feb013f..ca6c213141202fc59bee5a42726c798d386e6894 100644
--- a/cmake/BornAgain/Directories.cmake
+++ b/cmake/BornAgain/Directories.cmake
@@ -18,9 +18,9 @@ set(EXAMPLE_DATA_DIR            ${EXAMPLES_DIR}/data)
 # auto directories (refreshed when CONFIGURE options are set)
 # -----------------------------------------------------------------------------
 
-set(AUTO_DIR ${CMAKE_SOURCE_DIR}/auto/Wrap)
+set(AUTO_WRAP_DIR ${CMAKE_SOURCE_DIR}/auto/Wrap)
 
-file(MAKE_DIRECTORY ${AUTO_DIR})
+file(MAKE_DIRECTORY ${AUTO_WRAP_DIR})
 
 # -----------------------------------------------------------------------------
 # output directories
diff --git a/cmake/BornAgain/MakeLib.cmake b/cmake/BornAgain/MakeLib.cmake
index 86ad2b519c28d1907571b3fb159e4459e8657435..0f9a0ef5b87cd18d09933931f6046773d748f830 100644
--- a/cmake/BornAgain/MakeLib.cmake
+++ b/cmake/BornAgain/MakeLib.cmake
@@ -15,7 +15,7 @@ function(MakeLib lib)
 
         if((CLANG) OR (GCC))
             # suppress warnings from auto-generated code (last updated for Swig 4.0.1)
-            set_source_files_properties(${AUTO_DIR}/lib${lib}_wrap.cpp
+            set_source_files_properties(${AUTO_WRAP_DIR}/lib${lib}_wrap.cpp
                 PROPERTIES COMPILE_OPTIONS
                 "\
 -Wno-unused-parameter;\
@@ -24,7 +24,7 @@ function(MakeLib lib)
 -Wno-deprecated-declarations")
         endif()
 
-        list(APPEND source_files ${AUTO_DIR}/lib${lib}_wrap.cpp)
+        list(APPEND source_files ${AUTO_WRAP_DIR}/lib${lib}_wrap.cpp)
     endif()
 
     set_target_properties(${lib} PROPERTIES
diff --git a/cmake/BornAgain/PythonAPI.cmake b/cmake/BornAgain/PythonAPI.cmake
index a7e94f302e229b5588fbb0e6fd414e3342c9c5a1..073a7899baa238f968743e5711fd76cd5f4b3b3e 100644
--- a/cmake/BornAgain/PythonAPI.cmake
+++ b/cmake/BornAgain/PythonAPI.cmake
@@ -25,13 +25,13 @@ endforeach()
 
 if(CONFIGURE_BINDINGS)
     add_custom_command(
-        OUTPUT ${AUTO_DIR}/swig_runtime.h
-        COMMAND ${SWIG_EXECUTABLE} -c++;-python;-external-runtime;${AUTO_DIR}/swig_runtime.h
+        OUTPUT ${AUTO_WRAP_DIR}/swig_runtime.h
+        COMMAND ${SWIG_EXECUTABLE} -c++;-python;-external-runtime;${AUTO_WRAP_DIR}/swig_runtime.h
         DEPENDS ${swig_dependencies} ${include_files}
         )
 endif()
 
-add_custom_target(swig_runtime DEPENDS ${AUTO_DIR}/swig_runtime.h)
+add_custom_target(swig_runtime DEPENDS ${AUTO_WRAP_DIR}/swig_runtime.h)
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
     DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.py )
@@ -43,7 +43,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
     DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.png)
 
 if(BA_CPP_API)
-    install(FILES ${AUTO_DIR}/swig_runtime.h
+    install(FILES ${AUTO_WRAP_DIR}/swig_runtime.h
         DESTINATION ${destination_include}/Wrap COMPONENT Headers)
 endif()
 
diff --git a/cmake/BornAgain/SwigLib.cmake b/cmake/BornAgain/SwigLib.cmake
index 2c76ed79543c5adae9801e6df4e182102c6b0904..3a94bf13043b5187235071ec85f05784192775ac 100644
--- a/cmake/BornAgain/SwigLib.cmake
+++ b/cmake/BornAgain/SwigLib.cmake
@@ -31,21 +31,21 @@ function(SwigLib name lib swigtmpdir)
         #     Please keep -Werror, in order not to overlook critical warnings.
         #     Dispensable warnings are disabled in Wrap/Swig/warnings.i.
         #     Joachim, oct20.
-        set(SWIG_FLAGS "-c++;-python;-Werror;-o;${AUTO_DIR}/lib${lib}_wrap.cpp;-outdir;${swigtmpdir}"
+        set(SWIG_FLAGS "-c++;-python;-Werror;-o;${AUTO_WRAP_DIR}/lib${lib}_wrap.cpp;-outdir;${swigtmpdir}"
             ";-I${LibHeinz_INCLUDE_DIR}"
             ";-I${CMAKE_SOURCE_DIR};-I${CMAKE_BINARY_DIR}/inc")
 
         add_custom_command(
-            OUTPUT ${AUTO_DIR}/lib${lib}.py
+            OUTPUT ${AUTO_WRAP_DIR}/lib${lib}.py
             COMMAND ${Python3_EXECUTABLE} ${SWIG_DIR}/tweaks.py
                    ${swigtmpdir}/lib${lib}.py
-                   ${AUTO_DIR}/lib${lib}.py
+                   ${AUTO_WRAP_DIR}/lib${lib}.py
             DEPENDS ${swigtmpdir}/lib${lib}.py
             )
         add_custom_command(
             OUTPUT ${swigtmpdir}/lib${lib}.py
-                   ${AUTO_DIR}/lib${lib}_wrap.h
-                   ${AUTO_DIR}/lib${lib}_wrap.cpp
+                   ${AUTO_WRAP_DIR}/lib${lib}_wrap.h
+                   ${AUTO_WRAP_DIR}/lib${lib}_wrap.cpp
             COMMAND ${SWIG_EXECUTABLE} ${SWIG_FLAGS} ${SWIG_DIR}/lib${lib}.i
             DEPENDS ${swig_dependencies} ${include_files}
             )
@@ -64,8 +64,8 @@ function(SwigLib name lib swigtmpdir)
     add_custom_target(
         ${lib}_python
         COMMAND ${CMAKE_COMMAND}
-            -E copy ${AUTO_DIR}/lib${lib}.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${lib}.py
-        DEPENDS ${AUTO_DIR}/lib${lib}.py
+            -E copy ${AUTO_WRAP_DIR}/lib${lib}.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${lib}.py
+        DEPENDS ${AUTO_WRAP_DIR}/lib${lib}.py
         )
 
     set_target_properties(${lib} PROPERTIES