diff --git a/apps/DoseTool/CMakeLists.txt b/apps/DoseTool/CMakeLists.txt
index be15112..c1af0e1 100644
--- a/apps/DoseTool/CMakeLists.txt
+++ b/apps/DoseTool/CMakeLists.txt
@@ -1,5 +1,5 @@
MESSAGE (STATUS "generating app: DoseTool - calculating dose statistics and DVH")
SET(RTTB_Boost_ADDITIONAL_COMPONENT program_options)
-RTTB_CREATE_APPLICATION(RTTBDoseTool DEPENDS RTTBCore RTTBBoostMask RTTBOtherIO RTTBAlgorithms RTTBUtilsIO PACKAGE_DEPENDS ArgumentParsingLib BoostBinaries)
+RTTB_CREATE_APPLICATION(RTTBDoseTool DEPENDS RTTBCore RTTBMask RTTBOtherIO RTTBAlgorithms RTTBUtilsIO PACKAGE_DEPENDS ArgumentParsingLib BoostBinaries)
SET_TARGET_PROPERTIES(RTTBDoseTool PROPERTIES OUTPUT_NAME "DoseTool")
diff --git a/apps/VoxelizerTool/CMakeLists.txt b/apps/VoxelizerTool/CMakeLists.txt
index 685710a..8d832d1 100644
--- a/apps/VoxelizerTool/CMakeLists.txt
+++ b/apps/VoxelizerTool/CMakeLists.txt
@@ -1,4 +1,4 @@
MESSAGE (STATUS "generating app: VoxelizerTool - voxelize DICOM RTSTRUCT files")
SET(RTTB_Boost_ADDITIONAL_COMPONENT program_options)
-RTTB_CREATE_APPLICATION(RTTBVoxelizerTool DEPENDS RTTBBoostMask RTTBCore RTTBUtilsIO PACKAGE_DEPENDS ArgumentParsingLib ITK BoostBinaries)
+RTTB_CREATE_APPLICATION(RTTBVoxelizerTool DEPENDS RTTBMask RTTBCore RTTBUtilsIO PACKAGE_DEPENDS ArgumentParsingLib ITK BoostBinaries)
SET_TARGET_PROPERTIES(RTTBVoxelizerTool PROPERTIES OUTPUT_NAME "VoxelizerTool")
diff --git a/code/masks/CMakeLists.txt b/code/masks/CMakeLists.txt
index ea7fb93..9267d7b 100644
--- a/code/masks/CMakeLists.txt
+++ b/code/masks/CMakeLists.txt
@@ -1,9 +1,8 @@
-MESSAGE (STATUS "processing RTToolbox mask")
-
-RTTB_CREATE_MODULE(RTTBMasks DEPENDS RTTBCore PACKAGE_DEPENDS BoostBinaries)
+MESSAGE (STATUS "processing RTToolbox boost mask")
SET(RTTB_Boost_ADDITIONAL_COMPONENT thread)
-RTTB_CREATE_MODULE(RTTBBoostMask DEPENDS RTTBCore RTTBMasks PACKAGE_DEPENDS BoostBinaries)
+RTTB_CREATE_MODULE(RTTBMask DEPENDS RTTBCore PACKAGE_DEPENDS BoostBinaries)
+
IF (CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
ENDIF()
diff --git a/testing/algorithms/CMakeLists.txt b/testing/algorithms/CMakeLists.txt
index 4ac3665..81a5bc5 100644
--- a/testing/algorithms/CMakeLists.txt
+++ b/testing/algorithms/CMakeLists.txt
@@ -1,20 +1,20 @@
#-----------------------------------------------------------------------------
# Setup the system information test. Write out some basic failsafe
# information in case the test doesn't run.
#-----------------------------------------------------------------------------
SET(ALGORITHMS_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbAlgorithmsTests)
SET(ALGORITHMS_HEADER_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbAlgorithmsHeaderTest)
SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
#-----------------------------------------------------------------------------
ADD_TEST(DoseStatisticsTest ${ALGORITHMS_TESTS} DoseStatisticsTest)
ADD_TEST(ArithmeticTest ${ALGORITHMS_TESTS} ArithmeticTest)
ADD_TEST(DoseStatisticsCalculatorTest ${ALGORITHMS_TESTS} DoseStatisticsCalculatorTest "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom_heartComplex.xml" "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm")
ADD_TEST(BinaryFunctorAccessorTest ${ALGORITHMS_TESTS} BinaryFunctorAccessorTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm")
-RTTB_CREATE_TEST_MODULE(Algorithms DEPENDS RTTBAlgorithms RTTBBoostMask RTTBDicomIO PACKAGE_DEPENDS Boost Litmus RTTBData DCMTK)
+RTTB_CREATE_TEST_MODULE(Algorithms DEPENDS RTTBAlgorithms RTTBMask RTTBDicomIO PACKAGE_DEPENDS Boost Litmus RTTBData DCMTK)
diff --git a/testing/examples/CMakeLists.txt b/testing/examples/CMakeLists.txt
index 27f9254..0ebf7ee 100644
--- a/testing/examples/CMakeLists.txt
+++ b/testing/examples/CMakeLists.txt
@@ -1,26 +1,26 @@
#-----------------------------------------------------------------------------
# Setup the system information test. Write out some basic failsafe
# information in case the test doesn't run.
#-----------------------------------------------------------------------------
SET(CORE_TEST_EXAMPLES ${EXECUTABLE_OUTPUT_PATH}/rttbExamplesTests)
SET(TEMP ${RTTBTesting_BINARY_DIR}/Temporary)
#-----------------------------------------------------------------------------
ADD_TEST(RTBioModelExampleTest ${CORE_TEST_EXAMPLES} RTBioModelExampleTest
"${TEST_DATA_ROOT}/DVH/XML/dvh_PTV_HIT.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT1.xml"
"${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT2.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT3.xml"
"${TEST_DATA_ROOT}/DVH/XML/dvh_test_TV.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_virtuos_diff_trunk6.xml"
"${TEST_DATA_ROOT}/DVH/XML/dvh_virtuos_diff_trunk8.xml")
ADD_TEST(RTDoseIndexTest ${CORE_TEST_EXAMPLES} RTDoseIndexTest
"${TEST_DATA_ROOT}/DVH/XML/dvh_test_TV.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT1.xml"
"${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT2.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT3.xml")
ADD_TEST(RTDoseStatisticsDicomTest ${CORE_TEST_EXAMPLES} RTDoseStatisticsDicomTest
"${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo_withDoseGridScaling.dcm")
ADD_TEST(RTDVHTest ${CORE_TEST_EXAMPLES} RTDVHTest "${TEST_DATA_ROOT}/DVH/XML/dvh_test.xml")
ADD_TEST(RTBioModelScatterPlotExampleTest ${CORE_TEST_EXAMPLES} RTBioModelScatterPlotExampleTest
"${TEST_DATA_ROOT}/DVH/XML/dvh_PTV_HIT.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_HT1.xml" "${TEST_DATA_ROOT}/DVH/XML/dvh_test_TV.xml")
-RTTB_CREATE_TEST_MODULE(Examples DEPENDS RTTBCore RTTBAlgorithms RTTBMasks RTTBBoostMask RTTBIndices RTTBDicomIO RTTBITKIO RTTBOtherIO RTTBModels PACKAGE_DEPENDS Litmus RTTBData)
+RTTB_CREATE_TEST_MODULE(Examples DEPENDS RTTBCore RTTBAlgorithms RTTBMask RTTBIndices RTTBDicomIO RTTBITKIO RTTBOtherIO RTTBModels PACKAGE_DEPENDS Litmus RTTBData)
diff --git a/testing/io/itk/CMakeLists.txt b/testing/io/itk/CMakeLists.txt
index fe7720e..934afa9 100644
--- a/testing/io/itk/CMakeLists.txt
+++ b/testing/io/itk/CMakeLists.txt
@@ -1,27 +1,27 @@
#-----------------------------------------------------------------------------
# Setup the system information test. Write out some basic failsafe
# information in case the test doesn't run.
#-----------------------------------------------------------------------------
SET(ITKIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbITKIOTests)
SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
#-----------------------------------------------------------------------------
ADD_TEST(ITKDoseAccessorGeneratorTest ${ITKIO_TEST} ITKDoseAccessorGeneratorTest "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd" "${TEST_DATA_ROOT}/Images/ITK/doseAccReference.nrrd" "${TEST_DATA_ROOT}/Images/ITK/emptyImageVector.png" "${TEST_DATA_ROOT}/Images/ITK/Png2D-bw.png")
ADD_TEST(ITKIOTest ${ITKIO_TEST} ITKIOTest "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd" "${TEST_DATA_ROOT}/StructureSet/ITK/voxelizedNodes.nrrd")
ADD_TEST(ITKDoseAccessorConverterTest ${ITKIO_TEST} ITKDoseAccessorConverterTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd" )
ADD_TEST(ITKBioModelAccessorConverterTest ${ITKIO_TEST} ITKBioModelAccessorConverterTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm")
ADD_TEST(ITKMaskAccessorGeneratorTest ${ITKIO_TEST} ITKMaskAccessorGeneratorTest "${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
ADD_TEST(ITKMaskAccessorConverterTest ${ITKIO_TEST} ITKMaskAccessorConverterTest "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm"
"${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
-RTTB_CREATE_TEST_MODULE(ITKIO DEPENDS RTTBITKIO RTTBDicomIO RTTBMasks RTTBBoostMask RTTBModels PACKAGE_DEPENDS Boost Litmus ITK DCMTK RTTBData)
+RTTB_CREATE_TEST_MODULE(ITKIO DEPENDS RTTBITKIO RTTBDicomIO RTTBMask RTTBModels PACKAGE_DEPENDS Boost Litmus ITK DCMTK RTTBData)
diff --git a/testing/masks/CMakeLists.txt b/testing/masks/CMakeLists.txt
index 4f7e84d..65e4c24 100644
--- a/testing/masks/CMakeLists.txt
+++ b/testing/masks/CMakeLists.txt
@@ -1,20 +1,20 @@
#-----------------------------------------------------------------------------
# Setup the system information test. Write out some basic failsafe
# information in case the test doesn't run.
#-----------------------------------------------------------------------------
SET(Boost_Mask_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbBoostMaskTests)
SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
#-----------------------------------------------------------------------------
ADD_TEST(BoostMaskTest ${Boost_Mask_TESTS} BoostMaskTest)
-RTTB_CREATE_TEST_MODULE(BoostMask DEPENDS RTTBDicomIO RTTBMasks RTTBBoostMask PACKAGE_DEPENDS BoostBinaries Litmus DCMTK)
+RTTB_CREATE_TEST_MODULE(Mask DEPENDS RTTBDicomIO RTTBMask PACKAGE_DEPENDS BoostBinaries Litmus DCMTK)
IF (CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
ENDIF()
\ No newline at end of file
diff --git a/testing/validation/CMakeLists.txt b/testing/validation/CMakeLists.txt
index 26a62f5..b8bb1a8 100644
--- a/testing/validation/CMakeLists.txt
+++ b/testing/validation/CMakeLists.txt
@@ -1,27 +1,27 @@
#-----------------------------------------------------------------------------
# Setup the system information test. Write out some basic failsafe
# information in case the test doesn't run.
#-----------------------------------------------------------------------------
SET(CORE_TEST_VALIDATION ${EXECUTABLE_OUTPUT_PATH}/rttbValidationTests)
SET(TEMP ${RTTBTesting_BINARY_DIR}/Temporary)
#-----------------------------------------------------------------------------
ADD_TEST(VoxelizationDVHComparisonTest ${CORE_TEST_VALIDATION} VoxelizationDVHComparisonTest
"${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm"
"${TEST_DATA_ROOT}/DVH/XML/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/OTBMask/"
"${TEST_DATA_ROOT}/DVH/XML/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask_LEGACY/"
"${RTTBTesting_BINARY_DIR}/validation/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask/")
ADD_TEST(VoxelizationValidationTest ${CORE_TEST_VALIDATION} VoxelizationValidationTest
"${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm"
"${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm" "${TEST_DATA_ROOT}/Mask/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask/"
"${TEST_DATA_ROOT}/Mask/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/OTBMask/")
-RTTB_CREATE_TEST_MODULE(Validation DEPENDS RTTBCore RTTBBoostMask RTTBDicomIO RTTBITKIO RTTBOtherIO PACKAGE_DEPENDS Litmus ITK RTTBData)
+RTTB_CREATE_TEST_MODULE(Validation DEPENDS RTTBCore RTTBMask RTTBDicomIO RTTBITKIO RTTBOtherIO PACKAGE_DEPENDS Litmus ITK RTTBData)
IF (CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
ENDIF()