diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
index a85d949..862efb7 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
@@ -732,7 +732,7 @@
                 # check for all intent partitions
                 topics = []
                 for i in range( 14 ):
-                    topics.append( "intent-partition-" + str( i ) )
+                    topics.append( "work-partition-" + str( i ) )
                 main.log.debug( topics )
                 ONOStopics = [ j['topic'] for j in parsedLeaders ]
                 for topic in topics:
@@ -877,7 +877,7 @@
                     # check for election
                     topics = []
                     for i in range( 14 ):
-                        topics.append( "intent-partition-" + str( i ) )
+                        topics.append( "work-partition-" + str( i ) )
                     # FIXME: this should only be after we start the app
                     topics.append( "org.onosproject.election" )
                     main.log.debug( topics )
@@ -1027,7 +1027,7 @@
                 # TODO: Look at Devices as topics now that it uses this system
                 topics = []
                 for i in range( 14 ):
-                    topics.append( "intent-partition-" + str( i ) )
+                    topics.append( "work-partition-" + str( i ) )
                 # FIXME: this should only be after we start the app
                 # FIXME: topics.append( "org.onosproject.election" )
                 # Print leaders output
@@ -1126,7 +1126,7 @@
                     # check for election
                     topics = []
                     for i in range( 14 ):
-                        topics.append( "intent-partition-" + str( i ) )
+                        topics.append( "work-partition-" + str( i ) )
                     # FIXME: this should only be after we start the app
                     topics.append( "org.onosproject.election" )
                     main.log.debug( topics )
