diff --git a/Tests/Functional/CMakeLists.txt b/Tests/Functional/CMakeLists.txt
index e391ee9d632ada1cf244a84164f320dd9dd24053..b90aa7df76ded4925c112bb40e17d4725b2785c9 100644
--- a/Tests/Functional/CMakeLists.txt
+++ b/Tests/Functional/CMakeLists.txt
@@ -5,5 +5,5 @@
 include_directories(${CMAKE_SOURCE_DIR}/Tests/Functional/TestMachinery)
 
 add_subdirectory(Consistence)
-add_subdirectory(LibFit)
+add_subdirectory(Mumufit)
 add_subdirectory(Fitting)
diff --git a/Tests/Functional/Consistence/CMakeLists.txt b/Tests/Functional/Consistence/CMakeLists.txt
index 46021b1f4ef311b9f7785333025ab4c12b41ab20..badefe84eba765245548354ae57e01193624dd75 100644
--- a/Tests/Functional/Consistence/CMakeLists.txt
+++ b/Tests/Functional/Consistence/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(GoogleTest) # provides gtest_discover_tests
 
-set(test TestCoreConsistence)
+set(test FuTestConsistence)
 
 file(GLOB source_files *.cpp)
 
diff --git a/Tests/Functional/Fitting/CMakeLists.txt b/Tests/Functional/Fitting/CMakeLists.txt
index c014c872a3d02b068537ec76ea95ef36b810d4ba..f8c6b38939b21c60e1b7addd73227c3c2c822c0d 100644
--- a/Tests/Functional/Fitting/CMakeLists.txt
+++ b/Tests/Functional/Fitting/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 include(GoogleTest) # provides gtest_discover_tests
 
-set(test TestCoreFitting)
+set(test FuTestFitting)
 
 file(GLOB source_files *.cpp)
 
diff --git a/Tests/Functional/LibFit/CMakeLists.txt b/Tests/Functional/Mumufit/CMakeLists.txt
similarity index 90%
rename from Tests/Functional/LibFit/CMakeLists.txt
rename to Tests/Functional/Mumufit/CMakeLists.txt
index 208a70af098a917444ea326e5c961f09c5c8347a..4599e37cc376d380445082825180ee13a520e342 100644
--- a/Tests/Functional/LibFit/CMakeLists.txt
+++ b/Tests/Functional/Mumufit/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(GoogleTest) # provides gtest_discover_tests
 
-set(test TestMinimizers)
+set(test FuTestMumufit)
 
 file(GLOB source_files *.cpp)
 
@@ -9,4 +9,4 @@ target_include_directories(${test}
     PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include)
 target_link_libraries(${test} BornAgainFit gtest)
 
-gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Functional.Fit.)
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Functional.Mumufit.)
diff --git a/Tests/Functional/LibFit/ClassicalTestFunctions.cpp b/Tests/Functional/Mumufit/ClassicalTestFunctions.cpp
similarity index 94%
rename from Tests/Functional/LibFit/ClassicalTestFunctions.cpp
rename to Tests/Functional/Mumufit/ClassicalTestFunctions.cpp
index cac686933bd70d15d22651e5d586c6c09fae4e4c..68cd3a63129092a16eeb2c5665973ede48d2682d 100644
--- a/Tests/Functional/LibFit/ClassicalTestFunctions.cpp
+++ b/Tests/Functional/Mumufit/ClassicalTestFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ClassicalTestFunctions.cpp
+//! @file      Tests/Functional/Mumufit/ClassicalTestFunctions.cpp
 //! @brief     Implements set of ObjectiveTestFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Tests/Functional/LibFit/ClassicalTestFunctions.h"
+#include "Tests/Functional/Mumufit/ClassicalTestFunctions.h"
 #include <cassert>
 #include <cmath>
 
diff --git a/Tests/Functional/LibFit/ClassicalTestFunctions.h b/Tests/Functional/Mumufit/ClassicalTestFunctions.h
similarity index 94%
rename from Tests/Functional/LibFit/ClassicalTestFunctions.h
rename to Tests/Functional/Mumufit/ClassicalTestFunctions.h
index 78d29d910e8a39040f3cc194f0a963a2dcbb3294..0cf0dc165ed2675b73efd7445cecfe5974579a8c 100644
--- a/Tests/Functional/LibFit/ClassicalTestFunctions.h
+++ b/Tests/Functional/Mumufit/ClassicalTestFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ClassicalTestFunctions.h
+//! @file      Tests/Functional/Mumufit/ClassicalTestFunctions.h
 //! @brief     Declares set of ObjectiveTestFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/LibFit/MinimizerTests.cpp b/Tests/Functional/Mumufit/MinimizerTests.cpp
similarity index 97%
rename from Tests/Functional/LibFit/MinimizerTests.cpp
rename to Tests/Functional/Mumufit/MinimizerTests.cpp
index 8e8c945e429d65a4733e7a36eda58da232e0b88b..e342c2d15b66447fc9b330a79ba863f5c09fcb13 100644
--- a/Tests/Functional/LibFit/MinimizerTests.cpp
+++ b/Tests/Functional/Mumufit/MinimizerTests.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/MinimizerTests.cpp
+//! @file      Tests/Functional/Mumufit/MinimizerTests.cpp
 //! @brief     Implements classes from MinimizerTest family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Fit/Kernel/Minimizer.h"
-#include "Tests/Functional/LibFit/PlanCases.h"
+#include "Tests/Functional/Mumufit/PlanCases.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 bool runMinimizerTest(const std::string& minimizer_name, const std::string& algorithm_name,
diff --git a/Tests/Functional/LibFit/PlanCases.cpp b/Tests/Functional/Mumufit/PlanCases.cpp
similarity index 95%
rename from Tests/Functional/LibFit/PlanCases.cpp
rename to Tests/Functional/Mumufit/PlanCases.cpp
index 4996a837d15c74d32323cb13986d2dd3ffe2396e..30416028f40e0f6ebea68e473b7c3412ff42f733 100644
--- a/Tests/Functional/LibFit/PlanCases.cpp
+++ b/Tests/Functional/Mumufit/PlanCases.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/PlanCases.cpp
+//! @file      Tests/Functional/Mumufit/PlanCases.cpp
 //! @brief     Defines collection of FunctionTestPlan classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Tests/Functional/LibFit/PlanCases.h"
-#include "Tests/Functional/LibFit/ClassicalTestFunctions.h"
+#include "Tests/Functional/Mumufit/PlanCases.h"
+#include "Tests/Functional/Mumufit/ClassicalTestFunctions.h"
 
 namespace {
 
diff --git a/Tests/Functional/LibFit/PlanCases.h b/Tests/Functional/Mumufit/PlanCases.h
similarity index 92%
rename from Tests/Functional/LibFit/PlanCases.h
rename to Tests/Functional/Mumufit/PlanCases.h
index 5cf700161b3164be5fd056d41cd83c166cf504e7..ee99cbd351da1dc17c5241013f14b2ba1a1834a6 100644
--- a/Tests/Functional/LibFit/PlanCases.h
+++ b/Tests/Functional/Mumufit/PlanCases.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/PlanCases.h
+//! @file      Tests/Functional/Mumufit/PlanCases.h
 //! @brief     Defines collection of FunctionTestPlan classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_TESTS_FUNCTIONAL_LIBFIT_PLANCASES_H
 #define BORNAGAIN_TESTS_FUNCTIONAL_LIBFIT_PLANCASES_H
 
-#include "Tests/Functional/LibFit/ResidualTestPlan.h"
-#include "Tests/Functional/LibFit/ScalarTestPlan.h"
+#include "Tests/Functional/Mumufit/ResidualTestPlan.h"
+#include "Tests/Functional/Mumufit/ScalarTestPlan.h"
 
 //! Setting for standalone fit of Rosenbrock function.
 
diff --git a/Tests/Functional/LibFit/ResidualTestPlan.cpp b/Tests/Functional/Mumufit/ResidualTestPlan.cpp
similarity index 94%
rename from Tests/Functional/LibFit/ResidualTestPlan.cpp
rename to Tests/Functional/Mumufit/ResidualTestPlan.cpp
index d9a0eea86277fe86c8f8ec01a4a3d4b870ed0547..a7fe377a67fffdaef95bbb4e38a85c65117ac0f4 100644
--- a/Tests/Functional/LibFit/ResidualTestPlan.cpp
+++ b/Tests/Functional/Mumufit/ResidualTestPlan.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ResidualTestPlan.cpp
+//! @file      Tests/Functional/Mumufit/ResidualTestPlan.cpp
 //! @brief     Implements class ResidualTestPlan
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Tests/Functional/LibFit/ResidualTestPlan.h"
+#include "Tests/Functional/Mumufit/ResidualTestPlan.h"
 #include "Fit/Kernel/Minimizer.h"
 #include <cassert>
 #include <iostream>
diff --git a/Tests/Functional/LibFit/ResidualTestPlan.h b/Tests/Functional/Mumufit/ResidualTestPlan.h
similarity index 95%
rename from Tests/Functional/LibFit/ResidualTestPlan.h
rename to Tests/Functional/Mumufit/ResidualTestPlan.h
index 1b66d24eb0a128513e8f8f32d850b1a2d30ba788..a895a24dda9fb7f7f68c43f40557ceab19d1806c 100644
--- a/Tests/Functional/LibFit/ResidualTestPlan.h
+++ b/Tests/Functional/Mumufit/ResidualTestPlan.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ResidualTestPlan.h
+//! @file      Tests/Functional/Mumufit/ResidualTestPlan.h
 //! @brief     Defines class ResidualTestPlan
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/LibFit/ScalarTestPlan.cpp b/Tests/Functional/Mumufit/ScalarTestPlan.cpp
similarity index 94%
rename from Tests/Functional/LibFit/ScalarTestPlan.cpp
rename to Tests/Functional/Mumufit/ScalarTestPlan.cpp
index 0fb0ca9487538bfc765922742df2352a7139306b..e2856e8a68ec273ebbcffeaecd1cebae1fb9f361 100644
--- a/Tests/Functional/LibFit/ScalarTestPlan.cpp
+++ b/Tests/Functional/Mumufit/ScalarTestPlan.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ScalarTestPlan.cpp
+//! @file      Tests/Functional/Mumufit/ScalarTestPlan.cpp
 //! @brief     Implements class ScalarTestPlan
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Tests/Functional/LibFit/ScalarTestPlan.h"
+#include "Tests/Functional/Mumufit/ScalarTestPlan.h"
 #include "Fit/Kernel/Minimizer.h"
 #include <cmath>
 #include <iostream>
diff --git a/Tests/Functional/LibFit/ScalarTestPlan.h b/Tests/Functional/Mumufit/ScalarTestPlan.h
similarity index 96%
rename from Tests/Functional/LibFit/ScalarTestPlan.h
rename to Tests/Functional/Mumufit/ScalarTestPlan.h
index 628f6a2e7a99c5e6d49dfeac47019d89bd97fdf9..eb7daa5d47ad444aa943aebc8220563e19722c90 100644
--- a/Tests/Functional/LibFit/ScalarTestPlan.h
+++ b/Tests/Functional/Mumufit/ScalarTestPlan.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/Functional/LibFit/ScalarTestPlan.h
+//! @file      Tests/Functional/Mumufit/ScalarTestPlan.h
 //! @brief     Defines class ScalarTestPlan
 //!
 //! @homepage  http://www.bornagainproject.org