diff --git a/auto/Examples/fit/scatter2d/minimizer_settings.py b/auto/Examples/fit/scatter2d/minimizer_settings.py
index a95e54328e9348d5c172e9effb52e6f6a19e478f..8d8e31f9d4f007c40c53ff3891f6e280e6014bfd 100755
--- a/auto/Examples/fit/scatter2d/minimizer_settings.py
+++ b/auto/Examples/fit/scatter2d/minimizer_settings.py
@@ -51,7 +51,7 @@ def get_simulation(P):
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 
-def create_real_data():
+def fake_data():
     """
     Generating "real" data from simulated image with default parameters.
     """
@@ -66,7 +66,7 @@ def create_real_data():
     simulation = get_simulation(P)
     result = simulation.simulate()
 
-    return result.npArray()
+    return result
 
 
 def run_fitting():
@@ -74,7 +74,7 @@ def run_fitting():
     main function to run fitting
     """
 
-    real_data = create_real_data()
+    data = fake_data()
 
     # prints info about available minimizers
     print(ba.MinimizerFactory().catalogToString())
@@ -83,7 +83,7 @@ def run_fitting():
     print(ba.MinimizerFactory().catalogDetailsToString())
 
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+    fit_objective.addFitPair(get_simulation, data, 1)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()
diff --git a/auto/MiniExamples/fit/scatter2d/minimizer_settings.py b/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
index e554661c94c00916bb2bd44f6c64be987d92542b..2093950d49840863a714e4cd1d05ff3b4b173f33 100755
--- a/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
+++ b/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
@@ -51,7 +51,7 @@ def get_simulation(P):
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 
-def create_real_data():
+def fake_data():
     """
     Generating "real" data from simulated image with default parameters.
     """
@@ -66,7 +66,7 @@ def create_real_data():
     simulation = get_simulation(P)
     result = simulation.simulate()
 
-    return result.npArray()
+    return result
 
 
 def run_fitting():
@@ -74,7 +74,7 @@ def run_fitting():
     main function to run fitting
     """
 
-    real_data = create_real_data()
+    data = fake_data()
 
     # prints info about available minimizers
     print(ba.MinimizerFactory().catalogToString())
@@ -83,7 +83,7 @@ def run_fitting():
     print(ba.MinimizerFactory().catalogDetailsToString())
 
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+    fit_objective.addFitPair(get_simulation, data, 1)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()
diff --git a/rawEx/fit/scatter2d/minimizer_settings.py b/rawEx/fit/scatter2d/minimizer_settings.py
index c39b50349dea59a5692ec1cf8050bfb1a022b91f..48808a4725bb7535f7a249625808a6d3a065e84b 100755
--- a/rawEx/fit/scatter2d/minimizer_settings.py
+++ b/rawEx/fit/scatter2d/minimizer_settings.py
@@ -51,7 +51,7 @@ def get_simulation(P):
     return ba.ScatteringSimulation(beam, get_sample(P), detector)
 
 
-def create_real_data():
+def fake_data():
     """
     Generating "real" data from simulated image with default parameters.
     """
@@ -66,7 +66,7 @@ def create_real_data():
     simulation = get_simulation(P)
     result = simulation.simulate()
 
-    return result.npArray()
+    return result
 
 
 def run_fitting():
@@ -74,7 +74,7 @@ def run_fitting():
     main function to run fitting
     """
 
-    real_data = create_real_data()
+    data = fake_data()
 
     # prints info about available minimizers
     print(ba.MinimizerFactory().catalogToString())
@@ -83,7 +83,7 @@ def run_fitting():
     print(ba.MinimizerFactory().catalogDetailsToString())
 
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+    fit_objective.addFitPair(get_simulation, data, 1)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()