diff --git a/src/methods/naive_bayes_classifier/naive_bayes_classifier_test.pl b/src/methods/naive_bayes_classifier/naive_bayes_classifier_test.pl
index ca08ac2f06b25802cc36ef44b02cb4083bc2517f..a334ac2df150394d47b33eee45bc8f7a1b4d0308 100644
--- a/src/methods/naive_bayes_classifier/naive_bayes_classifier_test.pl
+++ b/src/methods/naive_bayes_classifier/naive_bayes_classifier_test.pl
@@ -73,7 +73,7 @@ test(nbc_InitModelWithTrain_CSV_Input) :-
 
 
 %%
-%% TESTING predicate classifyMatrix/10
+%% TESTING predicate classifyMatrix/5
 %%
 :- begin_tests(classifyMatrix).      
 
@@ -81,18 +81,18 @@ test(nbc_InitModelWithTrain_CSV_Input) :-
 
 test(nbc_ClassifyMatrix_Before_Train, [error(_,system_error('Error'))]) :-
         reset_Model_NoTrain,
-        initModelWithTrain([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, _, _, _).
+        classifyMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, _, _, _).
                          
 test(nbc_ClassifyMatrix_Diffrent_Dims_To_Train, [error(_,system_error('Error'))]) :-
         reset_Model_WithTrain,
-        initModelWithTrain([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 4, _, _, _).
+        classifyMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 4, _, _, _).
         
 
 %% Successful Tests
 
 test(nbc_ClassifyMatrix_Normal_Use) :-
         reset_Model_WithTrain,
-        initModelWithTrain([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, PredictionList, _, ProbabilitiesList),
+        classifyMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, PredictionList, _, ProbabilitiesList),
         print('\nPredictions: '),
         print(PredictionList),
         print('\nProbabilities: '),
@@ -102,7 +102,7 @@ test(nbc_ClassifyMatrix_CSV_Input) :-
         reset_Model_WithTrain,
         open('src/data_csv/iris2.csv', read, File),
         take_csv_row(File, skipFirstRow,10, Data),
-        initModelWithTrain(Data, 4, PredictionList, _, ProbabilitiesList),
+        classifyMatrix(Data, 4, PredictionList, _, ProbabilitiesList),
         print('\nPredictions: '),
         print(PredictionList),
         print('\nProbabilities: '),
@@ -113,7 +113,7 @@ test(nbc_ClassifyMatrix_CSV_Input) :-
 
 
 %%
-%% TESTING predicate means/10
+%% TESTING predicate means/2
 %%
 :- begin_tests(means).      
 
@@ -138,7 +138,7 @@ test(nbc_Means_Normal_Use) :-
 
 
 %%
-%% TESTING predicate probabilities/10
+%% TESTING predicate probabilities/2
 %%
 :- begin_tests(probabilities).      
 
@@ -171,36 +171,36 @@ test(nbc_Probabilities_Normal_Use) :-
                                             
 test(nbc_TrainMatrix_Negative_NumClasses, fail) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1], -2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1], -2, 0).
 
 test(nbc_TrainMatrix_Too_Short_Label, [error(_,system_error('Error'))]) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1], 2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1], 2, 0).
 
 test(nbc_TrainMatrix_Too_Long_Label, [error(_,system_error('Error'))]) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1,0,1], 2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1,0,1], 2, 0).
 
 test(nbc_TrainMatrix_Too_Many_Label_Classes, [error(_,system_error('Error'))]) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,2,3], 2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,2,3], 2, 0).
         
 
 %% Successful Tests
 
 test(nbc_TrainMatrix_Normal_Use) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1], 2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 3, [0,1,0,1], 2, 0).
 
 test(nbc_TrainMatrix_After_InitTrain) :-
         reset_Model_WithTrain,
-        train([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 4, [0,1,0], 2, 0).
+        trainMatrix([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5], 4, [0,1,0], 2, 0).
 
 test(nbc_TrainMatrix_CSV_Input) :-
         reset_Model_NoTrain,
         open('src/data_csv/iris2.csv', read, File),
         take_csv_row(File, skipFirstRow,10, Data),
-        train(Data, 4, [0,1,0,1,1,0,1,1,1,0], 2, 0).
+        trainMatrix(Data, 4, [0,1,0,1,1,0,1,1,1,0], 2, 0).
 
 :- end_tests(trainMatrix).
 
@@ -215,29 +215,29 @@ test(nbc_TrainMatrix_CSV_Input) :-
 
 test(nbc_TrainPoint_Bad_Label, [error(_,system_error('Error'))]) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4], -5).
+        trainPoint([5.1,3.5,1.4], -5).
 
 test(nbc_TrainPoint_Too_Long_Point, [error(_,system_error('Error'))]) :-
         reset_Model_WithTrain,
-        train([5.1,3.5,1.4,3.5], 0).
+        trainPoint([5.1,3.5,1.4,3.5], 0).
         
 
 %% Successful Tests
 
 test(nbc_TrainPoint_Normal_Use) :-
         reset_Model_NoTrain,
-        train([5.1,3.5,1.4], 0).
+        trainPoint([5.1,3.5,1.4], 0).
 
 test(nbc_TrainPoint_After_InitTrain) :-
         reset_Model_WithTrain,
-        train([5.1,3.5,1.4], 1).
+        trainPoint([5.1,3.5,1.4], 1).
 
 :- end_tests(trainPoint).
 
 
 
 %%
-%% TESTING predicate variances/10
+%% TESTING predicate variances/2
 %%
 :- begin_tests(variances).