diff --git a/src/tests/ErrorFunctions_test.cpp b/src/tests/ErrorFunctions_test.cpp
index 16af741d9eb6be2bd0cac816c2ff1140776a7a83..550e71983c828a9efb3099c63c3603131a74bebc 100644
--- a/src/tests/ErrorFunctions_test.cpp
+++ b/src/tests/ErrorFunctions_test.cpp
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_SUITE(ErrorFunctions_test)
     }
 
     BOOST_AUTO_TEST_CASE(ErrorFunction_MSE_SUM_Construction_Test) {
-        BOOST_CHECK_NO_THROW(MSE_SUM mse_sum);
+        BOOST_CHECK_NO_THROW(ErrorSum mse_sum);
     }
 
     BOOST_AUTO_TEST_CASE(ErrorFunction_MSE_SUM_Add_Error_Function_Test) {
@@ -107,12 +107,12 @@ BOOST_AUTO_TEST_SUITE(ErrorFunctions_test)
 
         ErrorFunction *f = new MSE(&network, &dataSet);
 
-        MSE_SUM mse_sum;
+        ErrorSum mse_sum;
         BOOST_CHECK_NO_THROW(mse_sum.add_error_function(f));
     }
 
     BOOST_AUTO_TEST_CASE(ErrorFunction_MSE_SUM_Eval_Test) {
-        MSE_SUM mse_sum;
+        ErrorSum mse_sum;
         double weights[1] = {0};
 
         Neuron *n1 = new NeuronLinear(1, 1);
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_SUITE(ErrorFunctions_test)
     }
 
     BOOST_AUTO_TEST_CASE(ErrorFunction_MSE_SUM_Get_Dimension_test) {
-        MSE_SUM mse_sum;
+        ErrorSum mse_sum;
         BOOST_CHECK_EQUAL(0, mse_sum.get_dimension());
 
         Neuron *n1 = new NeuronLinear(1, 1);
diff --git a/src/tests/NeuronLinear_test.cpp b/src/tests/NeuronLinear_test.cpp
index 07e96ae151666eb565e91ed3eaad8f70f8fd85af..85efdf634558eb3c304d490ab3ee01d59e2a350b 100644
--- a/src/tests/NeuronLinear_test.cpp
+++ b/src/tests/NeuronLinear_test.cpp
@@ -44,11 +44,11 @@ BOOST_AUTO_TEST_SUITE(neuronLinear_test)
         NeuronLinear neuron(5.0, 3.0);
         
         //Test of correct output of activation_function_get_derivative method
-        BOOST_CHECK_EQUAL(3.0, neuron.activation_function_get_derivative());
+        BOOST_CHECK_EQUAL(3.0, neuron.activation_function_eval_derivative());
         //Tests of correct outputs of activation_function_get_partial_derivative method
-        BOOST_CHECK_EQUAL(1.0, neuron.activation_function_get_partial_derivative(0));
-        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_get_partial_derivative(1));
-        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_get_partial_derivative(10000));
+        BOOST_CHECK_EQUAL(1.0, neuron.activation_function_eval_partial_derivative(0));
+        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(1));
+        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(10000));
     }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/tests/NeuronLogistic_test.cpp b/src/tests/NeuronLogistic_test.cpp
index 14c150d52c83b0b620ee982c67c4957ea482feef..7d3e9fe4bcca31c993e99951b8943089a80a7786 100644
--- a/src/tests/NeuronLogistic_test.cpp
+++ b/src/tests/NeuronLogistic_test.cpp
@@ -44,11 +44,11 @@ BOOST_AUTO_TEST_SUITE(neuronLogistic_test)
         NeuronLogistic neuron(3.0, 2.0);
 
         //Test of correct output of activation_function_get_derivative method
-        BOOST_CHECK_CLOSE(0.00447566759338, neuron.activation_function_get_derivative(), 0.00001);
+        BOOST_CHECK_CLOSE(0.00447566759338, neuron.activation_function_eval_derivative(), 0.00001);
         //Tests of correct outputs of activation_function_get_partial_derivative method
-        BOOST_CHECK_CLOSE(-0.0036025788498, neuron.activation_function_get_partial_derivative(0), 0.00001);
-        BOOST_CHECK_CLOSE(-0.0044756675933, neuron.activation_function_get_partial_derivative(1), 0.00001);
-        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_get_partial_derivative(10000));
+        BOOST_CHECK_CLOSE(-0.0036025788498, neuron.activation_function_eval_partial_derivative(0), 0.00001);
+        BOOST_CHECK_CLOSE(-0.0044756675933, neuron.activation_function_eval_partial_derivative(1), 0.00001);
+        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(10000));
     }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/tests/NeuronTanh.cpp b/src/tests/NeuronTanh.cpp
index 951b30dc36821ef40325edbb4e8daca7127c8658..cac6e0982d00011a03c6917ca6f5b439e7527d96 100644
--- a/src/tests/NeuronTanh.cpp
+++ b/src/tests/NeuronTanh.cpp
@@ -42,10 +42,10 @@ BOOST_AUTO_TEST_SUITE(neuronTanh_test)
         NeuronTanh neuron(2.0);
 
         //Test of correct output of activation_function_get_derivative method
-        BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_get_derivative(), 0.00001);
+        BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_eval_derivative(), 0.00001);
         //Tests of correct outputs of activation_function_get_partial_derivative method
-        BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_get_partial_derivative(0), 0.00001);
-        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_get_partial_derivative(10000));
+        BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_eval_partial_derivative(0), 0.00001);
+        BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(10000));
     }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file