diff --git a/TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.params b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.params
similarity index 100%
rename from TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.params
rename to TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.params
diff --git a/TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.py b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
similarity index 99%
rename from TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.py
rename to TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
index 6a6fe23..51ac0f6 100644
--- a/TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.py
+++ b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
@@ -19,7 +19,7 @@
 CASE14: start election app on all onos nodes
 CASE15: Check that Leadership Election is still functional
 '''
-class SingleInstanceHATestRestart:
+class HATestSingleInstanceRestart:
 
     def __init__(self) :
         self.default = ''
diff --git a/TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.topo b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.topo
similarity index 100%
rename from TestON/tests/SingleInstanceHATestRestart/SingleInstanceHATestRestart.topo
rename to TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.topo
diff --git a/TestON/tests/SingleInstanceHATestRestart/__init__.py b/TestON/tests/HATestSingleInstanceRestart/__init__.py
similarity index 100%
rename from TestON/tests/SingleInstanceHATestRestart/__init__.py
rename to TestON/tests/HATestSingleInstanceRestart/__init__.py