diff --git a/Base/CMakeLists.txt b/Base/CMakeLists.txt
index 2d0171bc2f7d15916caeca582e96e381357b9b4e..fffaa68303a8b40444e74fa57155aa3da3d9e1e3 100644
--- a/Base/CMakeLists.txt
+++ b/Base/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainCore
 ############################################################################
 
-set(name Base)
-set(lib BornAgain${name})
+set(component Base)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 05a8f7c690ab7be3fc3a4e085323004d456864a6..06569bd24f7482fb337a6b1d04cac52b347bf61a 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainCore
 ############################################################################
 
-set(name Core)
-set(lib BornAgain${name})
+set(component Core)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/Device/CMakeLists.txt b/Device/CMakeLists.txt
index 26e2777cc83ccb06487c2b57526fd3f36c1e5af2..4937f16383a331f43126bf99db66a32f25b18f86 100644
--- a/Device/CMakeLists.txt
+++ b/Device/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainDevice
 ############################################################################
 
-set(name Device)
-set(lib BornAgain${name})
+set(component Device)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt
index a66f03d823139620880118bfdb31f8aeda880315..6cbc90450d09393f9dc8d2726737169e01905b1b 100644
--- a/Fit/CMakeLists.txt
+++ b/Fit/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainFit
 ############################################################################
 
-set(name Fit)
-set(lib BornAgain${name})
+set(component Fit)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 4a9908d0082c9bde886a68415315d7738c4d47bb..a4d4a87463103ef5ce1c592d4fcbffb2c5de53f8 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 add_library(${library_name} SHARED ${source_files} ${RC_SRCS} ${include_files} ${form_files})
 set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
 set(${library_name}_LIBRARY_TYPE SHARED)
-# exposing library name and list of include directories outside
+# exposing library component and list of include directories outside
 set(${library_name}_INCLUDE_DIRS ${include_dirs})
 set(${library_name}_LIBRARY ${library_name})
 
diff --git a/Param/CMakeLists.txt b/Param/CMakeLists.txt
index 33b3df0609134759822bf8112148dd820772626a..cd64cd11eca7644c3ace8bf0e5debde901f5ce87 100644
--- a/Param/CMakeLists.txt
+++ b/Param/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainParam
 ############################################################################
 
-set(name Param)
-set(lib BornAgain${name})
+set(component Param)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/Resample/CMakeLists.txt b/Resample/CMakeLists.txt
index 90fe0fd85b9ca61409c72dc13e40d7b3ee39b940..03ab0d5e14a7e9ccf85ca960a0038960a47c6ab9 100644
--- a/Resample/CMakeLists.txt
+++ b/Resample/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainResample
 ############################################################################
 
-set(name Resample)
-set(lib BornAgain${name})
+set(component Resample)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
diff --git a/Sample/CMakeLists.txt b/Sample/CMakeLists.txt
index 984853ecc027c13e69e43537c4e0e93f18e05e59..5ffed8120d97d63c606da8d34c0a7c078604833e 100644
--- a/Sample/CMakeLists.txt
+++ b/Sample/CMakeLists.txt
@@ -2,8 +2,8 @@
 # CMakeLists.txt file for building libBornAgainSample
 ############################################################################
 
-set(name Sample)
-set(lib BornAgain${name})
+set(component Sample)
+set(lib BornAgain${component})
 
 # --- source and include files ---
 
@@ -12,7 +12,7 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
 # --- make the library ---
 
-MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
+MakeLib(${component} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap ${BORNAGAIN_PYTHON})
 
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)