diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 3026c1e..d77450a 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -2947,7 +2947,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the new leader is not the older leader, which was withdrawn
         if newLeader == oldLeader:
@@ -3032,7 +3032,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the re-elected node is last on the candidate List
         if oldLeader != newCandidates[ -1 ]:
diff --git a/TestON/tests/HAminorityRestart/HAminorityRestart.py b/TestON/tests/HAminorityRestart/HAminorityRestart.py
index 69c0645..d175fd7 100644
--- a/TestON/tests/HAminorityRestart/HAminorityRestart.py
+++ b/TestON/tests/HAminorityRestart/HAminorityRestart.py
@@ -2894,7 +2894,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the new leader is not the older leader, which was withdrawn
         if newLeader == oldLeader:
@@ -2979,7 +2979,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the re-elected node is last on the candidate List
         if oldLeader != newCandidates[ -1 ]:
diff --git a/TestON/tests/HAsanity/HAsanity.py b/TestON/tests/HAsanity/HAsanity.py
index e136d5e..4f8fadc 100644
--- a/TestON/tests/HAsanity/HAsanity.py
+++ b/TestON/tests/HAsanity/HAsanity.py
@@ -2846,7 +2846,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the new leader is not the older leader, which was withdrawn
         if newLeader == oldLeader:
@@ -2931,7 +2931,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the re-elected node is last on the candidate List
         if oldLeader != newCandidates[ -1 ]:
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index a2602d1..19cc462 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -2020,7 +2020,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the new leader is not the older leader, which was withdrawn
         if newLeader == oldLeader:
@@ -2105,7 +2105,7 @@
         for candidates in newAllCandidates:
             if set( candidates ) != set( newCandidates ):
                 newLeaderResult = main.FALSE
-                main.error.log( "Discrepancy in candidate lists detected" )
+                main.log.error( "Discrepancy in candidate lists detected" )
 
         # Check that the re-elected node is last on the candidate List
         if oldLeader != newCandidates[ -1 ]:
