diff --git a/tests/Detailed_Contr_Sw_Messages.py b/tests/Detailed_Contr_Sw_Messages.py
index e5c1c57..30c72d9 100644
--- a/tests/Detailed_Contr_Sw_Messages.py
+++ b/tests/Detailed_Contr_Sw_Messages.py
@@ -40,7 +40,7 @@
     cs_config = config
 
 
-class Overlap_Checking(basic.SimpleDataPlane):
+class overlap_checking(basic.SimpleDataPlane):
     
     """Verify that if overlap check flag is set in the flow entry and an overlapping flow is inserted then an error 
         is generated and switch refuses flow entry"""
@@ -101,7 +101,7 @@
                                'Error Message code is not overlap')
 
 
-class No_Overlap_Checking(basic.SimpleDataPlane):
+class no_overlap_checking(basic.SimpleDataPlane):
 
     """Verify that without overlap check flag set, overlapping flows can be created."""  
     
@@ -133,7 +133,7 @@
         Verify_TableStats(self,active_entries=2)
 
 
-class Identical_Flows(basic.SimpleDataPlane):
+class identical_flows(basic.SimpleDataPlane):
     
     """Verify that adding two identical flows overwrites the existing one and clears counters"""
 
@@ -174,7 +174,7 @@
         Verify_FlowStats(self,match,byte_count=0,packet_count=0)
 
    
-class Emer_Flow_With_Timeout(basic.SimpleProtocol): 
+class emer_flow_with_timeout(basic.SimpleProtocol): 
 
     """Timeout values are not allowed for emergency flows"""
 
@@ -226,7 +226,7 @@
                                'Error Message code is not bad emergency timeout')
 
 
-class Missing_Modify_Add(basic.SimpleDataPlane):
+class missing_modify_add(basic.SimpleDataPlane):
 
     """If a modify does not match an existing flow, the flow gets added """
     
@@ -266,7 +266,7 @@
         Verify_TableStats(self,active_entries=1)
 
 
-class Modify_Action(basic.SimpleDataPlane):
+class modify_action(basic.SimpleDataPlane):
 
     """A modified flow preserves counters"""
     
@@ -304,7 +304,7 @@
         Verify_FlowStats(self,match,byte_count=(2*len(str(pkt))),packet_count=2)
 
 
-class Strict_Modify_Action(basic.SimpleDataPlane):
+class strict_mdify_action(basic.SimpleDataPlane):
 
     """Strict Modify Flow also changes action preserves counters"""
 
@@ -348,7 +348,7 @@
         Verify_FlowStats(self,match,byte_count=(2*len(str(pkt))),packet_count=2)
 
 
-class Delete_NonExisting_Flow(basic.SimpleDataPlane):
+class delete_nonexisting_flow(basic.SimpleDataPlane):
     
     """Request deletion of non-existing flow"""
     
@@ -382,7 +382,7 @@
 
 
         
-class Send_Flow_Rem(basic.SimpleDataPlane):
+class send_flow_rem(basic.SimpleDataPlane):
     
     """Check deletion of flows happens and generates messages as configured.
     If Send Flow removed message Flag is set in the flow entry, the flow deletion of that respective flow should generate the flow removed message, 
@@ -443,7 +443,7 @@
                         'Did not receive flow removed message for this flow')
 
 
-class Delete_Emer_Flow(basic.SimpleProtocol):
+class delete_emer_flow(basic.SimpleProtocol):
 
     """Delete emergency flow and verify no message is generated.An emergency flow deletion will not generate flow-removed messages even if 
     Send Flow removed message flag was set during the emergency flow entry"""
@@ -486,7 +486,7 @@
                         'Test Failed ')
 
 
-class Delete_Strict_NonStrict(basic.SimpleDataPlane):
+class delete_strict_nonstrict(basic.SimpleDataPlane):
 
     """Delete and verify strict and non-strict behaviors
     This test compares the behavior of delete strict and non-strict"""
@@ -573,7 +573,7 @@
 
         
    
-class Delete_With_Outport(basic.SimpleDataPlane):
+class delete_with_outport(basic.SimpleDataPlane):
 
     """Delete flows filtered by action outport.If the out_port field in the delete command contains a value other than OFPP_NONE,
     it introduces a constraint when matching. This constraint is that the rule must contain an output action directed at that port."""
@@ -632,7 +632,7 @@
         Verify_TableStats(self,active_entries=0)
 
 
-class Idle_Timeout(basic.SimpleDataPlane):
+class idle_timeout(basic.SimpleDataPlane):
 
     """ Verify that idle timeout is implemented"""
 
@@ -676,7 +676,7 @@
                          'Flow was not alive for 1 sec')
 
 
-class Add_Modify_With_Outport(basic.SimpleDataPlane):
+class add_modify_with_outport(basic.SimpleDataPlane):
 
     """Add, modify flows with outport set. This field is ignored by ADD, MODIFY, and MODIFY STRICT messages."""
 
@@ -716,7 +716,7 @@
 
 
 
-class Hard_Timeout(basic.SimpleDataPlane):
+class hard_timeout(basic.SimpleDataPlane):
 
     """ Verify that hard timeout is implemented """
 
@@ -760,7 +760,7 @@
                          'Flow was not alive for 1 sec')
 
 
-class Flow_Timeout(basic.SimpleDataPlane):
+class flow_timeout(basic.SimpleDataPlane):
   
     """Verify that Flow removed messages are generated as expected
     Flow removed messages being generated when flag is set, is already tested in the above tests