diff --git a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
index 142dba822db135804412f72d26906f2c72042200..29390fcc10e8b6843875ba9c1b61bb7e298a3070 100644
--- a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
+++ b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
@@ -27,7 +27,7 @@ namespace
 {
 
 std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
-                                               const Simulation& reference_simulation)
+                                               const Simulation& direct_simulation)
 {
     // initializing necessary GUI
     DocumentModel documentModel;
@@ -36,10 +36,9 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
     MaterialModel materialModel;
 
     // populating GUI models from domain
-    GUIObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel,
-                                                 reference_simulation);
-    GUIObjectBuilder::populateInstrumentModel(&instrumentModel, reference_simulation);
-    GUIObjectBuilder::populateDocumentModel(&documentModel, reference_simulation);
+    GUIObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel, direct_simulation);
+    GUIObjectBuilder::populateInstrumentModel(&instrumentModel, direct_simulation);
+    GUIObjectBuilder::populateDocumentModel(&documentModel, direct_simulation);
 
     std::unique_ptr<Simulation> domain_simulation = DomainSimulationBuilder::createSimulation(
         sampleModel.multiLayerItem(), instrumentModel.instrumentItem(),
diff --git a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
index 72afb99655588a5ce5bd663daaef9dc5adb19787..afd6e9f57019730e15f9f54c8b3393f30f80de3b 100644
--- a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
+++ b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
@@ -28,7 +28,7 @@ namespace
 {
 
 std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
-                                               const Simulation& reference_simulation)
+                                               const Simulation& direct_simulation)
 {
     const std::string output_name =
         FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name);
@@ -40,7 +40,7 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
     const std::string pyscript_filename =
         FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name + ".py");
     std::ofstream pythonFile(pyscript_filename);
-    pythonFile << ExportToPython::generatePyExportTest(reference_simulation);
+    pythonFile << ExportToPython::generatePyExportTest(direct_simulation);
     pythonFile.close();
 
     // Run Python script
@@ -76,11 +76,9 @@ bool PyStandardTest::runTest()
         domainData(m_name, *m_reference_simulation);
 
     // Run direct simulation
-    std::cout << "- run reference simulation\n";
+    std::cout << "- run direct simulation\n";
     m_reference_simulation->runSimulation();
-    const std::unique_ptr<OutputData<double>> reference_data =
-        m_reference_simulation->result().data();
+    const std::unique_ptr<OutputData<double>> direct_data = m_reference_simulation->result().data();
 
-    return IntensityDataFunctions::checkRelativeDifference(*domain_data, *reference_data,
-                                                           m_threshold);
+    return IntensityDataFunctions::checkRelativeDifference(*domain_data, *direct_data, m_threshold);
 }