diff --git a/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
index ef23794..2aea5bf 100644
--- a/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
+++ b/TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py
@@ -19,6 +19,8 @@
 CASE14: start election app on all onos nodes
 CASE15: Check that Leadership Election is still functional
 """
+
+
 class HATestSingleInstanceRestart:
 
     def __init__( self ):
@@ -44,116 +46,117 @@
         # TODO: save all the timers and output them for plotting
 
         # load some vairables from the params file
-        PULL_CODE = False
+        PULLCODE = False
         if main.params[ 'Git' ] == 'True':
-            PULL_CODE = True
+            PULLCODE = True
 
-        cell_name = main.params[ 'ENV' ][ 'cellName' ]
+        cellName = main.params[ 'ENV' ][ 'cellName' ]
 
         # set global variables
-        global ONOS1_ip
-        global ONOS1_port
-        global ONOS2_ip
-        global ONOS2_port
-        global ONOS3_ip
-        global ONOS3_port
-        global ONOS4_ip
-        global ONOS4_port
-        global ONOS5_ip
-        global ONOS5_port
-        global ONOS6_ip
-        global ONOS6_port
-        global ONOS7_ip
-        global ONOS7_port
-        global num_controllers
+        global ONOS1Ip
+        global ONOS1Port
+        global ONOS2Ip
+        global ONOS2Port
+        global ONOS3Ip
+        global ONOS3Port
+        global ONOS4Ip
+        global ONOS4Port
+        global ONOS5Ip
+        global ONOS5Port
+        global ONOS6Ip
+        global ONOS6Port
+        global ONOS7Ip
+        global ONOS7Port
+        global numControllers
 
-        ONOS1_ip = main.params[ 'CTRL' ][ 'ip1' ]
-        ONOS1_port = main.params[ 'CTRL' ][ 'port1' ]
-        ONOS2_ip = main.params[ 'CTRL' ][ 'ip2' ]
-        ONOS2_port = main.params[ 'CTRL' ][ 'port2' ]
-        ONOS3_ip = main.params[ 'CTRL' ][ 'ip3' ]
-        ONOS3_port = main.params[ 'CTRL' ][ 'port3' ]
-        ONOS4_ip = main.params[ 'CTRL' ][ 'ip4' ]
-        ONOS4_port = main.params[ 'CTRL' ][ 'port4' ]
-        ONOS5_ip = main.params[ 'CTRL' ][ 'ip5' ]
-        ONOS5_port = main.params[ 'CTRL' ][ 'port5' ]
-        ONOS6_ip = main.params[ 'CTRL' ][ 'ip6' ]
-        ONOS6_port = main.params[ 'CTRL' ][ 'port6' ]
-        ONOS7_ip = main.params[ 'CTRL' ][ 'ip7' ]
-        ONOS7_port = main.params[ 'CTRL' ][ 'port7' ]
-        num_controllers = int( main.params[ 'num_controllers' ] )
+        ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+        ONOS1Port = main.params[ 'CTRL' ][ 'port1' ]
+        ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+        ONOS2Port = main.params[ 'CTRL' ][ 'port2' ]
+        ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+        ONOS3Port = main.params[ 'CTRL' ][ 'port3' ]
+        ONOS4Ip = main.params[ 'CTRL' ][ 'ip4' ]
+        ONOS4Port = main.params[ 'CTRL' ][ 'port4' ]
+        ONOS5Ip = main.params[ 'CTRL' ][ 'ip5' ]
+        ONOS5Port = main.params[ 'CTRL' ][ 'port5' ]
+        ONOS6Ip = main.params[ 'CTRL' ][ 'ip6' ]
+        ONOS6Port = main.params[ 'CTRL' ][ 'port6' ]
+        ONOS7Ip = main.params[ 'CTRL' ][ 'ip7' ]
+        ONOS7Port = main.params[ 'CTRL' ][ 'port7' ]
+        numControllers = int( main.params[ 'num_controllers' ] )
 
         main.step( "Applying cell variable to environment" )
-        cell_result = main.ONOSbench.set_cell( cell_name )
-        verify_result = main.ONOSbench.verify_cell()
+        cellResult = main.ONOSbench.setCell( cellName )
+        verifyResult = main.ONOSbench.verifyCell()
 
         # FIXME:this is short term fix
         main.log.report( "Removing raft logs" )
-        main.ONOSbench.onos_remove_raft_logs()
+        main.ONOSbench.onosRemoveRaftLogs()
         main.log.report( "Uninstalling ONOS" )
-        main.ONOSbench.onos_uninstall( ONOS1_ip )
-        main.ONOSbench.onos_uninstall( ONOS2_ip )
-        main.ONOSbench.onos_uninstall( ONOS3_ip )
-        main.ONOSbench.onos_uninstall( ONOS4_ip )
-        main.ONOSbench.onos_uninstall( ONOS5_ip )
-        main.ONOSbench.onos_uninstall( ONOS6_ip )
-        main.ONOSbench.onos_uninstall( ONOS7_ip )
+        main.ONOSbench.onosUninstall( ONOS1Ip )
+        main.ONOSbench.onosUninstall( ONOS2Ip )
+        main.ONOSbench.onosUninstall( ONOS3Ip )
+        main.ONOSbench.onosUninstall( ONOS4Ip )
+        main.ONOSbench.onosUninstall( ONOS5Ip )
+        main.ONOSbench.onosUninstall( ONOS6Ip )
+        main.ONOSbench.onosUninstall( ONOS7Ip )
 
-        clean_install_result = main.TRUE
-        git_pull_result = main.TRUE
+        cleanInstallResult = main.TRUE
+        gitPullResult = main.TRUE
 
         main.step( "Compiling the latest version of ONOS" )
-        if PULL_CODE:
+        if PULLCODE:
             # TODO Configure branch in params
             main.step( "Git checkout and pull master" )
-            main.ONOSbench.git_checkout( "master" )
-            git_pull_result = main.ONOSbench.git_pull()
+            main.ONOSbench.gitCheckout( "master" )
+            gitPullResult = main.ONOSbench.gitPull()
 
             main.step( "Using mvn clean & install" )
-            clean_install_result = main.TRUE
-            if git_pull_result == main.TRUE:
-                clean_install_result = main.ONOSbench.clean_install()
+            cleanInstallResult = main.TRUE
+
+            if gitPullResult == main.TRUE:
+                cleanInstallResult = main.ONOSbench.cleanInstall()
             else:
                 main.log.warn( "Did not pull new code so skipping mvn " +
                                "clean install" )
-        main.ONOSbench.get_version( report=True )
+        main.ONOSbench.getVersion( report=True )
 
-        cell_result = main.ONOSbench.set_cell( "SingleHA" )
-        verify_result = main.ONOSbench.verify_cell()
+        cellResult = main.ONOSbench.setCell( "SingleHA" )
+        verifyResult = main.ONOSbench.verifyCell()
         main.step( "Creating ONOS package" )
-        package_result = main.ONOSbench.onos_package()
+        packageResult = main.ONOSbench.onosPackage()
 
         main.step( "Installing ONOS package" )
-        onos1_install_result = main.ONOSbench.onos_install( options="-f",
-                                                            node=ONOS1_ip )
+        onos1InstallResult = main.ONOSbench.onosInstall( options="-f",
+                                                           node=ONOS1Ip )
 
         main.step( "Checking if ONOS is up yet" )
         # TODO check bundle:list?
         for i in range( 2 ):
-            onos1_isup = main.ONOSbench.isup( ONOS1_ip )
-            if onos1_isup:
+            onos1Isup = main.ONOSbench.isup( ONOS1Ip )
+            if onos1Isup:
                 break
-        if not onos1_isup:
+        if not onos1Isup:
             main.log.report( "ONOS1 didn't start!" )
 
-        cli_result = main.ONOScli1.start_onos_cli( ONOS1_ip )
+        cliResult = main.ONOScli1.startOnosCli( ONOS1Ip )
 
         main.step( "Start Packet Capture MN" )
-        main.Mininet2.start_tcpdump(
+        main.Mininet2.startTcpdump(
             str( main.params[ 'MNtcpdump' ][ 'folder' ] ) + str( main.TEST )
             + "-MN.pcap",
             intf=main.params[ 'MNtcpdump' ][ 'intf' ],
             port=main.params[ 'MNtcpdump' ][ 'port' ] )
 
-        case1_result = ( clean_install_result and package_result and
-                         cell_result and verify_result and onos1_install_result
-                         and onos1_isup and cli_result )
+        case1Result = ( cleanInstallResult and packageResult and
+                        cellResult and verifyResult and onos1InstallResult
+                        and onos1Isup and cliResult )
 
-        utilities.assert_equals( expect=main.TRUE, actual=case1_result,
-                                 onpass="Test startup successful",
-                                 onfail="Test startup NOT successful" )
+        utilities.assert_equals( expect=main.TRUE, actual=case1Result,
+                                onpass="Test startup successful",
+                                onfail="Test startup NOT successful" )
 
-        if case1_result == main.FALSE:
+        if case1Result == main.FALSE:
             main.cleanup()
             main.exit()
 
@@ -168,26 +171,26 @@
         main.step( "Assign switches to controllers" )
 
         for i in range( 1, 29 ):
-            main.Mininet1.assign_sw_controller(
+            main.Mininet1.assignSwController(
                 sw=str( i ),
-                ip1=ONOS1_ip, port1=ONOS1_port )
+                ip1=ONOS1Ip, port1=ONOS1Port )
 
-        mastership_check = main.TRUE
+        mastershipCheck = main.TRUE
         for i in range( 1, 29 ):
-            response = main.Mininet1.get_sw_controller( "s" + str( i ) )
+            response = main.Mininet1.getSwController( "s" + str( i ) )
             try:
                 main.log.info( str( response ) )
             except:
                 main.log.info( repr( response ) )
-            if re.search( "tcp:" + ONOS1_ip, response ):
-                mastership_check = mastership_check and main.TRUE
+            if re.search( "tcp:" + ONOS1Ip, response ):
+                mastershipCheck = mastershipCheck and main.TRUE
             else:
-                mastership_check = main.FALSE
-        if mastership_check == main.TRUE:
+                mastershipCheck = main.FALSE
+        if mastershipCheck == main.TRUE:
             main.log.report( "Switch mastership assigned correctly" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=mastership_check,
+            actual=mastershipCheck,
             onpass="Switch mastership assigned correctly",
             onfail="Switches not assigned correctly to controllers" )
 
@@ -202,29 +205,29 @@
         main.log.report( "Adding host intents" )
         main.case( "Adding host Intents" )
 
-        main.step( "Discovering  Hosts( Via pingall for now)" )
+        main.step( "Discovering  Hosts( Via pingall for now )" )
         # FIXME: Once we have a host discovery mechanism, use that instead
 
         # install onos-app-fwd
         main.log.info( "Install reactive forwarding app" )
-        main.ONOScli1.feature_install( "onos-app-fwd" )
+        main.ONOScli1.featureInstall( "onos-app-fwd" )
 
         # REACTIVE FWD test
-        ping_result = main.FALSE
+        pingResult = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingall()
+        pingResult = main.Mininet1.pingall()
         time2 = time.time()
         main.log.info( "Time for pingall: %2f seconds" % ( time2 - time1 ) )
 
         # uninstall onos-app-fwd
         main.log.info( "Uninstall reactive forwarding app" )
-        main.ONOScli1.feature_uninstall( "onos-app-fwd" )
+        main.ONOScli1.featureUninstall( "onos-app-fwd" )
         # timeout for fwd flows
         time.sleep( 10 )
 
         main.step( "Add  host intents" )
         # TODO:  move the host numbers to params
-        intent_add_result = True
+        intentAddResult = True
         for i in range( 8, 18 ):
             main.log.info( "Adding host intent between h" + str( i ) +
                            " and h" + str( i + 10 ) )
@@ -232,23 +235,23 @@
                 str( hex( i )[ 2: ] ).zfill( 2 ).upper()
             host2 = "00:00:00:00:00:" + \
                 str( hex( i + 10 )[ 2: ] ).zfill( 2 ).upper()
-            host1_id = main.ONOScli1.get_host( host1 )[ 'id' ]
-            host2_id = main.ONOScli1.get_host( host2 )[ 'id' ]
+            host1Id = main.ONOScli1.getHost( host1 )[ 'id' ]
+            host2Id = main.ONOScli1.getHost( host2 )[ 'id' ]
             # NOTE: get host can return None
-            if host1_id and host2_id:
-                tmp_result = main.ONOScli1.add_host_intent(
-                    host1_id,
-                    host2_id )
+            if host1Id and host2Id:
+                tmpResult = main.ONOScli1.addHostIntent(
+                    host1Id,
+                    host2Id )
             else:
-                main.log.error( "Error, get_host() failed" )
-                tmp_result = main.FALSE
-            intent_add_result = bool( ping_result and intent_add_result
-                                      and tmp_result )
+                main.log.error( "Error, getHost() failed" )
+                tmpResult = main.FALSE
+            intentAddResult = bool( pingResult and intentAddResult
+                                     and tmpResult )
         utilities.assert_equals(
             expect=True,
-            actual=intent_add_result,
+            actual=intentAddResult,
             onpass="Switch mastership correctly assigned",
-            onfail="Error in (re)assigning switch mastership" )
+            onfail="Error in ( re )assigning switch mastership" )
         # TODO Check if intents all exist in datastore
 
     def CASE4( self, main ):
@@ -258,26 +261,26 @@
         description = " Ping across added host intents"
         main.log.report( description )
         main.case( description )
-        Ping_Result = main.TRUE
+        PingResult = main.TRUE
         for i in range( 8, 18 ):
             ping = main.Mininet1.pingHost(
                 src="h" + str( i ), target="h" + str( i + 10 ) )
-            Ping_Result = Ping_Result and ping
+            PingResult = PingResult and ping
             if ping == main.FALSE:
                 main.log.warn( "Ping failed between h" + str( i ) +
                                " and h" + str( i + 10 ) )
             elif ping == main.TRUE:
                 main.log.info( "Ping test passed!" )
-                Ping_Result = main.TRUE
-        if Ping_Result == main.FALSE:
+                PingResult = main.TRUE
+        if PingResult == main.FALSE:
             main.log.report(
                 "Intents have not been installed correctly, pings failed." )
-        if Ping_Result == main.TRUE:
+        if PingResult == main.TRUE:
             main.log.report(
                 "Intents have been installed correctly and verified by pings" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=Ping_Result,
+            actual=PingResult,
             onpass="Intents have been installed correctly and pings work",
             onfail="Intents have not been installed correctly, pings failed." )
 
@@ -296,58 +299,58 @@
         # We can then compare them with eachother and also with past states
 
         main.step( "Get the Mastership of each switch from each controller" )
-        global mastership_state
-        mastership_state = []
+        global mastershipState
+        mastershipState = []
 
         # Assert that each device has a master
-        roles_not_null = main.ONOScli1.roles_not_null()
+        rolesNotNull = main.ONOScli1.rolesNotNull()
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=roles_not_null,
+            actual=rolesNotNull,
             onpass="Each device has a master",
             onfail="Some devices don't have a master assigned" )
 
-        ONOS1_mastership = main.ONOScli1.roles()
+        ONOS1Mastership = main.ONOScli1.roles()
         # TODO: Make this a meaningful check
-        if "Error" in ONOS1_mastership or not ONOS1_mastership:
+        if "Error" in ONOS1Mastership or not ONOS1Mastership:
             main.log.report( "Error in getting ONOS roles" )
             main.log.warn(
                 "ONOS1 mastership response: " +
-                repr( ONOS1_mastership ) )
-            consistent_mastership = main.FALSE
+                repr( ONOS1Mastership ) )
+            consistentMastership = main.FALSE
         else:
-            mastership_state = ONOS1_mastership
-            consistent_mastership = main.TRUE
+            mastershipState = ONOS1Mastership
+            consistentMastership = main.TRUE
 
         main.step( "Get the intents from each controller" )
-        global intent_state
-        intent_state = []
-        ONOS1_intents = main.ONOScli1.intents( json_format=True )
-        intent_check = main.FALSE
-        if "Error" in ONOS1_intents or not ONOS1_intents:
+        global intentState
+        intentState = []
+        ONOS1Intents = main.ONOScli1.intents( jsonFormat=True )
+        intentCheck = main.FALSE
+        if "Error" in ONOS1Intents or not ONOS1Intents:
             main.log.report( "Error in getting ONOS intents" )
-            main.log.warn( "ONOS1 intents response: " + repr( ONOS1_intents ) )
+            main.log.warn( "ONOS1 intents response: " + repr( ONOS1Intents ) )
         else:
-            intent_check = main.TRUE
+            intentCheck = main.TRUE
 
         main.step( "Get the flows from each controller" )
-        global flow_state
-        flow_state = []
-        ONOS1_flows = main.ONOScli1.flows( json_format=True )
-        flow_check = main.FALSE
-        if "Error" in ONOS1_flows or not ONOS1_flows:
+        global flowState
+        flowState = []
+        ONOS1Flows = main.ONOScli1.flows( jsonFormat=True )
+        flowCheck = main.FALSE
+        if "Error" in ONOS1Flows or not ONOS1Flows:
             main.log.report( "Error in getting ONOS intents" )
-            main.log.warn( "ONOS1 flows repsponse: " + ONOS1_flows )
+            main.log.warn( "ONOS1 flows repsponse: " + ONOS1Flows )
         else:
             # TODO: Do a better check, maybe compare flows on switches?
-            flow_state = ONOS1_flows
-            flow_check = main.TRUE
+            flowState = ONOS1Flows
+            flowCheck = main.TRUE
 
         main.step( "Get the OF Table entries" )
         global flows
         flows = []
         for i in range( 1, 29 ):
-            flows.append( main.Mininet2.get_flowTable( 1.3, "s" + str( i ) ) )
+            flows.append( main.Mininet2.getFlowTable( 1.3, "s" + str( i ) ) )
 
         # TODO: Compare switch flow tables with ONOS flow tables
 
@@ -378,68 +381,68 @@
         links.append( main.ONOScli1.links() )
 
         main.step( "Comparing ONOS topology to MN" )
-        devices_results = main.TRUE
-        ports_results = main.TRUE
-        links_results = main.TRUE
-        for controller in range( num_controllers ):
-            controller_str = str( controller + 1 )
+        devicesResults = main.TRUE
+        portsResults = main.TRUE
+        linksResults = main.TRUE
+        for controller in range( numControllers ):
+            controllerStr = str( controller + 1 )
             if devices[ controller ] or "Error" not in devices[ controller ]:
-                current_devices_result = main.Mininet1.compare_switches(
+                currentDevicesResult = main.Mininet1.compareSwitches(
                     MNTopo,
                     json.loads(
                         devices[ controller ] ) )
             else:
-                current_devices_result = main.FALSE
+                currentDevicesResult = main.FALSE
             utilities.assert_equals( expect=main.TRUE,
-                                     actual=current_devices_result,
-                                     onpass="ONOS" + controller_str +
-                                     " Switches view is correct",
-                                     onfail="ONOS" + controller_str +
-                                     " Switches view is incorrect" )
+                                    actual=currentDevicesResult,
+                                    onpass="ONOS" + controllerStr +
+                                    " Switches view is correct",
+                                    onfail="ONOS" + controllerStr +
+                                    " Switches view is incorrect" )
 
             if ports[ controller ] or "Error" not in ports[ controller ]:
-                current_ports_result = main.Mininet1.compare_ports(
+                currentPortsResult = main.Mininet1.comparePorts(
                     MNTopo,
                     json.loads(
                         ports[ controller ] ) )
             else:
-                current_ports_result = main.FALSE
+                currentPortsResult = main.FALSE
             utilities.assert_equals( expect=main.TRUE,
-                                     actual=current_ports_result,
-                                     onpass="ONOS" + controller_str +
-                                     " ports view is correct",
-                                     onfail="ONOS" + controller_str +
-                                     " ports view is incorrect" )
+                                    actual=currentPortsResult,
+                                    onpass="ONOS" + controllerStr +
+                                    " ports view is correct",
+                                    onfail="ONOS" + controllerStr +
+                                    " ports view is incorrect" )
 
             if links[ controller ] or "Error" not in links[ controller ]:
-                current_links_result = main.Mininet1.compare_links(
+                currentLinksResult = main.Mininet1.compareLinks(
                     MNTopo,
                     json.loads(
                         links[ controller ] ) )
             else:
-                current_links_result = main.FALSE
+                currentLinksResult = main.FALSE
             utilities.assert_equals( expect=main.TRUE,
-                                     actual=current_links_result,
-                                     onpass="ONOS" + controller_str +
-                                     " links view is correct",
-                                     onfail="ONOS" + controller_str +
-                                     " links view is incorrect" )
+                                    actual=currentLinksResult,
+                                    onpass="ONOS" + controllerStr +
+                                    " links view is correct",
+                                    onfail="ONOS" + controllerStr +
+                                    " links view is incorrect" )
 
-            devices_results = devices_results and current_devices_result
-            ports_results = ports_results and current_ports_result
-            links_results = links_results and current_links_result
+            devicesResults = devicesResults and currentDevicesResult
+            portsResults = portsResults and currentPortsResult
+            linksResults = linksResults and currentLinksResult
 
-        topo_result = devices_results and ports_results and links_results
-        utilities.assert_equals( expect=main.TRUE, actual=topo_result,
-                                 onpass="Topology Check Test successful",
-                                 onfail="Topology Check Test NOT successful" )
+        topoResult = devicesResults and portsResults and linksResults
+        utilities.assert_equals( expect=main.TRUE, actual=topoResult,
+                                onpass="Topology Check Test successful",
+                                onfail="Topology Check Test NOT successful" )
 
-        final_assert = main.TRUE
-        final_assert = final_assert and topo_result and flow_check \
-            and intent_check and consistent_mastership and roles_not_null
-        utilities.assert_equals( expect=main.TRUE, actual=final_assert,
-                                 onpass="State check successful",
-                                 onfail="State check NOT successful" )
+        finalAssert = main.TRUE
+        finalAssert = finalAssert and topoResult and flowCheck \
+            and intentCheck and consistentMastership and rolesNotNull
+        utilities.assert_equals( expect=main.TRUE, actual=finalAssert,
+                                onpass="State check successful",
+                                onfail="State check NOT successful" )
 
     def CASE6( self, main ):
         """
@@ -449,25 +452,25 @@
 
         main.log.report( "Restart ONOS node" )
         main.log.case( "Restart ONOS node" )
-        main.ONOSbench.onos_kill( ONOS1_ip )
+        main.ONOSbench.onosKill( ONOS1Ip )
         start = time.time()
 
         main.step( "Checking if ONOS is up yet" )
         count = 0
         while count < 10:
-            onos1_isup = main.ONOSbench.isup( ONOS1_ip )
-            if onos1_isup == main.TRUE:
+            onos1Isup = main.ONOSbench.isup( ONOS1Ip )
+            if onos1Isup == main.TRUE:
                 elapsed = time.time() - start
                 break
             else:
                 count = count + 1
 
-        cli_result = main.ONOScli1.start_onos_cli( ONOS1_ip )
+        cliResult = main.ONOScli1.startOnosCli( ONOS1Ip )
 
-        case_results = main.TRUE and onos1_isup and cli_result
-        utilities.assert_equals( expect=main.TRUE, actual=case_results,
-                                 onpass="ONOS restart successful",
-                                 onfail="ONOS restart NOT successful" )
+        caseResults = main.TRUE and onos1Isup and cliResult
+        utilities.assert_equals( expect=main.TRUE, actual=caseResults,
+                                onpass="ONOS restart successful",
+                                onfail="ONOS restart NOT successful" )
         main.log.info(
             "ESTIMATE: ONOS took %s seconds to restart" %
             str( elapsed ) )
@@ -481,74 +484,74 @@
         main.case( "Running ONOS Constant State Tests" )
 
         # Assert that each device has a master
-        roles_not_null = main.ONOScli1.roles_not_null()
+        rolesNotNull = main.ONOScli1.rolesNotNull()
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=roles_not_null,
+            actual=rolesNotNull,
             onpass="Each device has a master",
             onfail="Some devices don't have a master assigned" )
 
         main.step( "Check if switch roles are consistent across all nodes" )
-        ONOS1_mastership = main.ONOScli1.roles()
+        ONOS1Mastership = main.ONOScli1.roles()
         # FIXME: Refactor this whole case for single instance
-        if "Error" in ONOS1_mastership or not ONOS1_mastership:
+        if "Error" in ONOS1Mastership or not ONOS1Mastership:
             main.log.report( "Error in getting ONOS mastership" )
             main.log.warn(
                 "ONOS1 mastership response: " +
-                repr( ONOS1_mastership ) )
-            consistent_mastership = main.FALSE
+                repr( ONOS1Mastership ) )
+            consistentMastership = main.FALSE
         else:
-            consistent_mastership = main.TRUE
+            consistentMastership = main.TRUE
             main.log.report(
                 "Switch roles are consistent across all ONOS nodes" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=consistent_mastership,
+            actual=consistentMastership,
             onpass="Switch roles are consistent across all ONOS nodes",
             onfail="ONOS nodes have different views of switch roles" )
 
         description2 = "Compare switch roles from before failure"
         main.step( description2 )
 
-        current_json = json.loads( ONOS1_mastership )
-        old_json = json.loads( mastership_state )
-        mastership_check = main.TRUE
+        currentJson = json.loads( ONOS1Mastership )
+        oldJson = json.loads( mastershipState )
+        mastershipCheck = main.TRUE
         for i in range( 1, 29 ):
             switchDPID = str(
                 main.Mininet1.getSwitchDPID(
                     switch="s" +
                     str( i ) ) )
 
-            current = [ switch[ 'master' ] for switch in current_json
+            current = [ switch[ 'master' ] for switch in currentJson
                         if switchDPID in switch[ 'id' ] ]
-            old = [ switch[ 'master' ] for switch in old_json
+            old = [ switch[ 'master' ] for switch in oldJson
                     if switchDPID in switch[ 'id' ] ]
             if current == old:
-                mastership_check = mastership_check and main.TRUE
+                mastershipCheck = mastershipCheck and main.TRUE
             else:
                 main.log.warn( "Mastership of switch %s changed" % switchDPID )
-                mastership_check = main.FALSE
-        if mastership_check == main.TRUE:
+                mastershipCheck = main.FALSE
+        if mastershipCheck == main.TRUE:
             main.log.report( "Mastership of Switches was not changed" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=mastership_check,
+            actual=mastershipCheck,
             onpass="Mastership of Switches was not changed",
             onfail="Mastership of some switches changed" )
-        mastership_check = mastership_check and consistent_mastership
+        mastershipCheck = mastershipCheck and consistentMastership
 
         main.step( "Get the intents and compare across all nodes" )
-        ONOS1_intents = main.ONOScli1.intents( json_format=True )
-        intent_check = main.FALSE
-        if "Error" in ONOS1_intents or not ONOS1_intents:
+        ONOS1Intents = main.ONOScli1.intents( jsonFormat=True )
+        intentCheck = main.FALSE
+        if "Error" in ONOS1Intents or not ONOS1Intents:
             main.log.report( "Error in getting ONOS intents" )
-            main.log.warn( "ONOS1 intents response: " + repr( ONOS1_intents ) )
+            main.log.warn( "ONOS1 intents response: " + repr( ONOS1Intents ) )
         else:
-            intent_check = main.TRUE
+            intentCheck = main.TRUE
             main.log.report( "Intents are consistent across all ONOS nodes" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=intent_check,
+            actual=intentCheck,
             onpass="Intents are consistent across all ONOS nodes",
             onfail="ONOS nodes have different views of intents" )
 
@@ -556,60 +559,60 @@
         # restarts
         """
         main.step( "Compare current intents with intents before the failure" )
-        # NOTE: this requires case 5 to pass for intent_state to be set.
+        # NOTE: this requires case 5 to pass for intentState to be set.
         #      maybe we should stop the test if that fails?
-        if intent_state == ONOS1_intents:
-            same_intents = main.TRUE
+        if intentState == ONOS1Intents:
+            sameIntents = main.TRUE
             main.log.report( "Intents are consistent with before failure" )
         # TODO: possibly the states have changed? we may need to figure out
         # what the aceptable states are
         else:
             try:
                 main.log.warn( "ONOS1 intents: " )
-                print json.dumps( json.loads( ONOS1_intents ),
+                print json.dumps( json.loads( ONOS1Intents ),
                                   sort_keys=True, indent=4,
                                   separators=( ',', ': ' ) )
             except:
                 pass
-            same_intents = main.FALSE
+            sameIntents = main.FALSE
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=same_intents,
+            actual=sameIntents,
             onpass="Intents are consistent with before failure",
             onfail="The Intents changed during failure" )
-        intent_check = intent_check and same_intents
+        intentCheck = intentCheck and sameIntents
         """
         main.step( "Get the OF Table entries and compare to before " +
                    "component failure" )
-        Flow_Tables = main.TRUE
+        FlowTables = main.TRUE
         flows2 = []
         for i in range( 28 ):
             main.log.info( "Checking flow table on s" + str( i + 1 ) )
-            tmp_flows = main.Mininet2.get_flowTable( 1.3, "s" + str( i + 1 ) )
-            flows2.append( tmp_flows )
-            temp_result = main.Mininet2.flow_comp(
+            tmpFlows = main.Mininet2.getFlowTable( 1.3, "s" + str( i + 1 ) )
+            flows2.append( tmpFlows )
+            tempResult = main.Mininet2.flowComp(
                 flow1=flows[ i ],
-                flow2=tmp_flows )
-            Flow_Tables = Flow_Tables and temp_result
-            if Flow_Tables == main.FALSE:
+                flow2=tmpFlows )
+            FlowTables = FlowTables and tempResult
+            if FlowTables == main.FALSE:
                 main.log.info( "Differences in flow table for switch: s" +
                                str( i + 1 ) )
-        if Flow_Tables == main.TRUE:
+        if FlowTables == main.TRUE:
             main.log.report( "No changes were found in the flow tables" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=Flow_Tables,
+            actual=FlowTables,
             onpass="No changes were found in the flow tables",
             onfail="Changes were found in the flow tables" )
 
         # Test of LeadershipElection
 
-        leader = ONOS1_ip
-        leader_result = main.TRUE
-        for controller in range( 1, num_controllers + 1 ):
+        leader = ONOS1Ip
+        leaderResult = main.TRUE
+        for controller in range( 1, numControllers + 1 ):
             # loop through ONOScli handlers
             node = getattr( main, ( 'ONOScli' + str( controller ) ) )
-            leaderN = node.election_test_leader()
+            leaderN = node.electionTestLeader()
             # verify leader is ONOS1
             # NOTE even though we restarted ONOS, it is the only one so onos 1
             # must be leader
@@ -619,33 +622,33 @@
             elif leaderN == main.FALSE:
                 # error in  response
                 main.log.report( "Something is wrong with " +
-                                 "election_test_leader function, check the" +
+                                 "electionTestLeader function, check the" +
                                  " error logs" )
-                leader_result = main.FALSE
+                leaderResult = main.FALSE
             elif leader != leaderN:
-                leader_result = main.FALSE
+                leaderResult = main.FALSE
                 main.log.report( "ONOS" + str( controller ) +
                                  " sees " + str( leaderN ) +
                                  " as the leader of the election app." +
                                  " Leader should be " + str( leader ) )
-        if leader_result:
-            main.log.report( "Leadership election tests passed(consistent " +
+        if leaderResult:
+            main.log.report( "Leadership election tests passed( consistent " +
                              "view of leader across listeners and a new " +
-                             "leader was re-elected if applicable)" )
+                             "leader was re-elected if applicable )" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=leader_result,
+            actual=leaderResult,
             onpass="Leadership election passed",
             onfail="Something went wrong with Leadership election" )
 
-        result = ( mastership_check and intent_check and Flow_Tables and
-                   roles_not_null and leader_result )
+        result = ( mastershipCheck and intentCheck and FlowTables and
+                   rolesNotNull and leaderResult )
         result = int( result )
         if result == main.TRUE:
             main.log.report( "Constant State Tests Passed" )
         utilities.assert_equals( expect=main.TRUE, actual=result,
-                                 onpass="Constant State Tests Passed",
-                                 onfail="Constant state tests failed" )
+                                onpass="Constant State Tests Passed",
+                                onfail="Constant state tests failed" )
 
     def CASE8( self, main ):
         """
@@ -677,21 +680,21 @@
             ctrls )  # can also add Intent API info for intent operations
 
         main.step( "Comparing ONOS topology to MN" )
-        devices_results = main.TRUE
-        ports_results = main.TRUE
-        links_results = main.TRUE
-        topo_result = main.FALSE
+        devicesResults = main.TRUE
+        portsResults = main.TRUE
+        linksResults = main.TRUE
+        topoResult = main.FALSE
         elapsed = 0
         count = 0
         main.step( "Collecting topology information from ONOS" )
-        start_time = time.time()
-        while topo_result == main.FALSE and elapsed < 60:
+        startTime = time.time()
+        while topoResult == main.FALSE and elapsed < 60:
             count = count + 1
             if count > 1:
                 MNTopo = TestONTopology(
                     main.Mininet1,
                     ctrls )
-            cli_start = time.time()
+            cliStart = time.time()
             devices = []
             devices.append( main.ONOScli1.devices() )
             """
@@ -702,73 +705,73 @@
             ports.append( main.ONOScli1.ports() )
             links = []
             links.append( main.ONOScli1.links() )
-            elapsed = time.time() - start_time
-            cli_time = time.time() - cli_start
-            print "CLI time: " + str( cli_time )
+            elapsed = time.time() - startTime
+            cliTime = time.time() - cliStart
+            print "CLI time: " + str( cliTime )
 
-            for controller in range( num_controllers ):
-                controller_str = str( controller + 1 )
+            for controller in range( numControllers ):
+                controllerStr = str( controller + 1 )
                 if devices[ controller ] or "Error" not in devices[
                         controller ]:
-                    current_devices_result = main.Mininet1.compare_switches(
+                    currentDevicesResult = main.Mininet1.compareSwitches(
                         MNTopo,
                         json.loads(
                             devices[ controller ] ) )
                 else:
-                    current_devices_result = main.FALSE
+                    currentDevicesResult = main.FALSE
                 utilities.assert_equals( expect=main.TRUE,
-                                         actual=current_devices_result,
-                                         onpass="ONOS" + controller_str +
-                                                " Switches view is correct",
-                                         onfail="ONOS" + controller_str +
-                                                " Switches view is incorrect" )
+                                        actual=currentDevicesResult,
+                                        onpass="ONOS" + controllerStr +
+                                        " Switches view is correct",
+                                        onfail="ONOS" + controllerStr +
+                                        " Switches view is incorrect" )
 
                 if ports[ controller ] or "Error" not in ports[ controller ]:
-                    current_ports_result = main.Mininet1.compare_ports(
+                    currentPortsResult = main.Mininet1.comparePorts(
                         MNTopo,
                         json.loads(
                             ports[ controller ] ) )
                 else:
-                    current_ports_result = main.FALSE
+                    currentPortsResult = main.FALSE
                 utilities.assert_equals( expect=main.TRUE,
-                                         actual=current_ports_result,
-                                         onpass="ONOS" + controller_str +
-                                                " ports view is correct",
-                                         onfail="ONOS" + controller_str +
-                                                " ports view is incorrect" )
+                                        actual=currentPortsResult,
+                                        onpass="ONOS" + controllerStr +
+                                        " ports view is correct",
+                                        onfail="ONOS" + controllerStr +
+                                        " ports view is incorrect" )
 
                 if links[ controller ] or "Error" not in links[ controller ]:
-                    current_links_result = main.Mininet1.compare_links(
+                    currentLinksResult = main.Mininet1.compareLinks(
                         MNTopo,
                         json.loads(
                             links[ controller ] ) )
                 else:
-                    current_links_result = main.FALSE
+                    currentLinksResult = main.FALSE
                 utilities.assert_equals( expect=main.TRUE,
-                                         actual=current_links_result,
-                                         onpass="ONOS" + controller_str +
-                                                " links view is correct",
-                                         onfail="ONOS" + controller_str +
-                                                " links view is incorrect" )
-            devices_results = devices_results and current_devices_result
-            ports_results = ports_results and current_ports_result
-            links_results = links_results and current_links_result
-            topo_result = devices_results and ports_results and links_results
+                                        actual=currentLinksResult,
+                                        onpass="ONOS" + controllerStr +
+                                        " links view is correct",
+                                        onfail="ONOS" + controllerStr +
+                                        " links view is incorrect" )
+            devicesResults = devicesResults and currentDevicesResult
+            portsResults = portsResults and currentPortsResult
+            linksResults = linksResults and currentLinksResult
+            topoResult = devicesResults and portsResults and linksResults
 
-        topo_result = topo_result and int( count <= 2 )
-        note = "note it takes about " + str( int( cli_time ) ) + \
-                " seconds for the test to make all the cli calls to fetch " +\
-                "the topology from each ONOS instance"
+        topoResult = topoResult and int( count <= 2 )
+        note = "note it takes about " + str( int( cliTime ) ) + \
+            " seconds for the test to make all the cli calls to fetch " +\
+            "the topology from each ONOS instance"
         main.log.report(
-            "Very crass estimate for topology discovery/convergence(" +
-            str( note ) + "): " + str( elapsed ) + " seconds, " +
+            "Very crass estimate for topology discovery/convergence( " +
+            str( note ) + " ): " + str( elapsed ) + " seconds, " +
             str( count ) + " tries" )
         if elapsed > 60:
             main.log.report( "Giving up on topology convergence" )
-        utilities.assert_equals( expect=main.TRUE, actual=topo_result,
-                                 onpass="Topology Check Test successful",
-                                 onfail="Topology Check Test NOT successful" )
-        if topo_result == main.TRUE:
+        utilities.assert_equals( expect=main.TRUE, actual=topoResult,
+                                onpass="Topology Check Test successful",
+                                onfail="Topology Check Test NOT successful" )
+        if topoResult == main.TRUE:
             main.log.report( "ONOS topology view matches Mininet topology" )
 
     def CASE9( self, main ):
@@ -778,23 +781,23 @@
         import time
         # NOTE: You should probably run a topology check after this
 
-        link_sleep = float( main.params[ 'timers' ][ 'LinkDiscovery' ] )
+        linkSleep = float( main.params[ 'timers' ][ 'LinkDiscovery' ] )
 
         description = "Turn off a link to ensure that Link Discovery " +\
-                "is working properly"
+            "is working properly"
         main.log.report( description )
         main.case( description )
 
         main.step( "Kill Link between s3 and s28" )
-        Link_Down = main.Mininet1.link( END1="s3", END2="s28", OPTION="down" )
+        LinkDown = main.Mininet1.link( END1="s3", END2="s28", OPTION="down" )
         main.log.info(
             "Waiting " +
-            str( link_sleep ) +
+            str( linkSleep ) +
             " seconds for link down to be discovered" )
-        time.sleep( link_sleep )
-        utilities.assert_equals( expect=main.TRUE, actual=Link_Down,
-                                 onpass="Link down succesful",
-                                 onfail="Failed to bring link down" )
+        time.sleep( linkSleep )
+        utilities.assert_equals( expect=main.TRUE, actual=LinkDown,
+                                onpass="Link down succesful",
+                                onfail="Failed to bring link down" )
         # TODO do some sort of check here
 
     def CASE10( self, main ):
@@ -804,23 +807,23 @@
         import time
         # NOTE: You should probably run a topology check after this
 
-        link_sleep = float( main.params[ 'timers' ][ 'LinkDiscovery' ] )
+        linkSleep = float( main.params[ 'timers' ][ 'LinkDiscovery' ] )
 
         description = "Restore a link to ensure that Link Discovery is " + \
-                "working properly"
+            "working properly"
         main.log.report( description )
         main.case( description )
 
         main.step( "Bring link between s3 and s28 back up" )
-        Link_Up = main.Mininet1.link( END1="s3", END2="s28", OPTION="up" )
+        LinkUp = main.Mininet1.link( END1="s3", END2="s28", OPTION="up" )
         main.log.info(
             "Waiting " +
-            str( link_sleep ) +
+            str( linkSleep ) +
             " seconds for link up to be discovered" )
-        time.sleep( link_sleep )
-        utilities.assert_equals( expect=main.TRUE, actual=Link_Up,
-                                 onpass="Link up succesful",
-                                 onfail="Failed to bring link up" )
+        time.sleep( linkSleep )
+        utilities.assert_equals( expect=main.TRUE, actual=LinkUp,
+                                onpass="Link up succesful",
+                                onfail="Failed to bring link up" )
         # TODO do some sort of check here
 
     def CASE11( self, main ):
@@ -830,7 +833,7 @@
         # NOTE: You should probably run a topology check after this
         import time
 
-        switch_sleep = float( main.params[ 'timers' ][ 'SwitchDiscovery' ] )
+        switchSleep = float( main.params[ 'timers' ][ 'SwitchDiscovery' ] )
 
         description = "Killing a switch to ensure it is discovered correctly"
         main.log.report( description )
@@ -841,19 +844,19 @@
         # TODO: Make this switch parameterizable
         main.step( "Kill " + switch )
         main.log.report( "Deleting " + switch )
-        main.Mininet1.del_switch( switch )
-        main.log.info( "Waiting " + str( switch_sleep ) +
+        main.Mininet1.delSwitch( switch )
+        main.log.info( "Waiting " + str( switchSleep ) +
                        " seconds for switch down to be discovered" )
-        time.sleep( switch_sleep )
-        device = main.ONOScli1.get_device( dpid=switchDPID )
+        time.sleep( switchSleep )
+        device = main.ONOScli1.getDevice( dpid=switchDPID )
         # Peek at the deleted switch
         main.log.warn( str( device ) )
         result = main.FALSE
         if device and device[ 'available' ] is False:
             result = main.TRUE
         utilities.assert_equals( expect=main.TRUE, actual=result,
-                                 onpass="Kill switch succesful",
-                                 onfail="Failed to kill switch?" )
+                                onpass="Kill switch succesful",
+                                onfail="Failed to kill switch?" )
 
     def CASE12( self, main ):
         """
@@ -862,7 +865,7 @@
         # NOTE: You should probably run a topology check after this
         import time
 
-        switch_sleep = float( main.params[ 'timers' ][ 'SwitchDiscovery' ] )
+        switchSleep = float( main.params[ 'timers' ][ 'SwitchDiscovery' ] )
         switch = main.params[ 'kill' ][ 'switch' ]
         switchDPID = main.params[ 'kill' ][ 'dpid' ]
         links = main.params[ 'kill' ][ 'links' ].split()
@@ -872,26 +875,26 @@
 
         main.step( "Add back " + switch )
         main.log.report( "Adding back " + switch )
-        main.Mininet1.add_switch( switch, dpid=switchDPID )
+        main.Mininet1.addSwitch( switch, dpid=switchDPID )
         # TODO: New dpid or same? Ask Thomas?
         for peer in links:
-            main.Mininet1.add_link( switch, peer )
-        main.Mininet1.assign_sw_controller( sw=switch.split( 's' )[ 1 ],
-                                            ip1=ONOS1_ip, port1=ONOS1_port )
+            main.Mininet1.addLink( switch, peer )
+        main.Mininet1.assignSwController( sw=switch.split( 's' )[ 1 ],
+                                           ip1=ONOS1Ip, port1=ONOS1Port )
         main.log.info(
             "Waiting " +
-            str( switch_sleep ) +
+            str( switchSleep ) +
             " seconds for switch up to be discovered" )
-        time.sleep( switch_sleep )
-        device = main.ONOScli1.get_device( dpid=switchDPID )
+        time.sleep( switchSleep )
+        device = main.ONOScli1.getDevice( dpid=switchDPID )
         # Peek at the deleted switch
         main.log.warn( str( device ) )
         result = main.FALSE
         if device and device[ 'available' ]:
             result = main.TRUE
         utilities.assert_equals( expect=main.TRUE, actual=result,
-                                 onpass="add switch succesful",
-                                 onfail="Failed to add switch?" )
+                                onpass="add switch succesful",
+                                onfail="Failed to add switch?" )
 
     def CASE13( self, main ):
         """
@@ -912,46 +915,46 @@
         main.log.report( description )
         main.case( description )
         main.step( "Killing tcpdumps" )
-        main.Mininet2.stop_tcpdump()
+        main.Mininet2.stopTcpdump()
 
         main.step( "Checking ONOS Logs for errors" )
         print colors[ 'purple' ] + "Checking logs for errors on ONOS1:" + \
-                colors[ 'end' ]
-        print main.ONOSbench.check_logs( ONOS1_ip )
+            colors[ 'end' ]
+        print main.ONOSbench.checkLogs( ONOS1Ip )
         main.step( "Copying MN pcap and ONOS log files to test station" )
         testname = main.TEST
-        teststation_user = main.params[ 'TESTONUSER' ]
-        teststation_IP = main.params[ 'TESTONIP' ]
+        teststationUser = main.params[ 'TESTONUSER' ]
+        teststationIP = main.params[ 'TESTONIP' ]
         # NOTE: MN Pcap file is being saved to ~/packet_captures
         #       scp this file as MN and TestON aren't necessarily the same vm
         # FIXME: scp
         # mn files
         # TODO: Load these from params
         # NOTE: must end in /
-        log_folder = "/opt/onos/log/"
-        log_files = [ "karaf.log", "karaf.log.1" ]
+        logFolder = "/opt/onos/log/"
+        logFiles = [ "karaf.log", "karaf.log.1" ]
         # NOTE: must end in /
-        dst_dir = "~/packet_captures/"
-        for f in log_files:
-            main.ONOSbench.handle.sendline( "scp sdn@" + ONOS1_ip + ":" +
-                                            log_folder + f + " " +
-                                            teststation_user + "@" +
-                                            teststation_IP + ":" + dst_dir +
+        dstDir = "~/packet_captures/"
+        for f in logFiles:
+            main.ONOSbench.handle.sendline( "scp sdn@" + ONOS1Ip + ":" +
+                                            logFolder + f + " " +
+                                            teststationUser + "@" +
+                                            teststationIP + ":" + dstDir +
                                             str( testname ) + "-ONOS1-" + f )
             main.ONOSbench.handle.expect( "\$" )
             print main.ONOSbench.handle.before
 
         # std*.log's
         # NOTE: must end in /
-        log_folder = "/opt/onos/var/"
-        log_files = [ "stderr.log", "stdout.log" ]
+        logFolder = "/opt/onos/var/"
+        logFiles = [ "stderr.log", "stdout.log" ]
         # NOTE: must end in /
-        dst_dir = "~/packet_captures/"
-        for f in log_files:
-            main.ONOSbench.handle.sendline( "scp sdn@" + ONOS1_ip + ":" +
-                                            log_folder + f + " " +
-                                            teststation_user + "@" +
-                                            teststation_IP + ":" + dst_dir +
+        dstDir = "~/packet_captures/"
+        for f in logFiles:
+            main.ONOSbench.handle.sendline( "scp sdn@" + ONOS1Ip + ":" +
+                                            logFolder + f + " " +
+                                            teststationUser + "@" +
+                                            teststationIP + ":" + dstDir +
                                             str( testname ) + "-ONOS1-" + f )
         # sleep so scp can finish
         time.sleep( 10 )
@@ -960,52 +963,52 @@
 
         # TODO: actually check something here
         utilities.assert_equals( expect=main.TRUE, actual=main.TRUE,
-                                 onpass="Test cleanup successful",
-                                 onfail="Test cleanup NOT successful" )
+                                onpass="Test cleanup successful",
+                                onfail="Test cleanup NOT successful" )
 
     def CASE14( self, main ):
         """
         start election app on all onos nodes
         """
-        leader_result = main.TRUE
+        leaderResult = main.TRUE
         # install app on onos 1
         main.log.info( "Install leadership election app" )
-        main.ONOScli1.feature_install( "onos-app-election" )
+        main.ONOScli1.featureInstall( "onos-app-election" )
         # wait for election
         # check for leader
-        leader = main.ONOScli1.election_test_leader()
+        leader = main.ONOScli1.electionTestLeader()
         # verify leader is ONOS1
-        if leader == ONOS1_ip:
+        if leader == ONOS1Ip:
             # all is well
             pass
         elif leader is None:
             # No leader elected
             main.log.report( "No leader was elected" )
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
         elif leader == main.FALSE:
             # error in  response
             # TODO: add check for "Command not found:" in the driver, this
             # means the app isn't loaded
-            main.log.report( "Something is wrong with election_test_leader" +
+            main.log.report( "Something is wrong with electionTestLeader" +
                              " function, check the error logs" )
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
         else:
             # error in  response
             main.log.report(
-                "Unexpected response from election_test_leader function:'" +
-                str(leader) +
+                "Unexpected response from electionTestLeader function:'" +
+                str( leader ) +
                 "'" )
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
 
         # install on other nodes and check for leader.
         # Should be onos1 and each app should show the same leader
-        for controller in range( 2, num_controllers + 1 ):
+        for controller in range( 2, numControllers + 1 ):
             # loop through ONOScli handlers
             node = getattr( main, ( 'ONOScli' + str( controller ) ) )
-            node.feature_install( "onos-app-election" )
-            leaderN = node.election_test_leader()
+            node.featureInstall( "onos-app-election" )
+            leaderN = node.electionTestLeader()
             # verify leader is ONOS1
-            if leaderN == ONOS1_ip:
+            if leaderN == ONOS1Ip:
                 # all is well
                 pass
             elif leaderN == main.FALSE:
@@ -1013,23 +1016,23 @@
                 # TODO: add check for "Command not found:" in the driver, this
                 # means the app isn't loaded
                 main.log.report( "Something is wrong with " +
-                                 "election_test_leader function, check the" +
+                                 "electionTestLeader function, check the" +
                                  " error logs" )
-                leader_result = main.FALSE
+                leaderResult = main.FALSE
             elif leader != leaderN:
-                leader_result = main.FALSE
+                leaderResult = main.FALSE
                 main.log.report( "ONOS" + str( controller ) + " sees " +
                                  str( leaderN ) +
                                  " as the leader of the election app. Leader" +
                                  " should be " +
                                  str( leader ) )
-        if leader_result:
+        if leaderResult:
             main.log.report( "Leadership election tests passed( consistent " +
                              "view of leader across listeners and a leader " +
-                             "was elected)" )
+                             "was elected )" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=leader_result,
+            actual=leaderResult,
             onpass="Leadership election passed",
             onfail="Something went wrong with Leadership election" )
 
@@ -1037,75 +1040,75 @@
         """
         Check that Leadership Election is still functional
         """
-        leader_result = main.TRUE
+        leaderResult = main.TRUE
         description = "Check that Leadership Election is still functional"
         main.log.report( description )
         main.case( description )
         main.step( "Find current leader and withdraw" )
-        leader = main.ONOScli1.election_test_leader()
+        leader = main.ONOScli1.electionTestLeader()
         # TODO: do some sanity checking on leader before using it
-        withdraw_result = main.FALSE
-        if leader == ONOS1_ip:
-            old_leader = getattr( main, "ONOScli1" )
+        withdrawResult = main.FALSE
+        if leader == ONOS1Ip:
+            oldLeader = getattr( main, "ONOScli1" )
         elif leader is None or leader == main.FALSE:
             main.log.report(
                 "Leader for the election app should be an ONOS node," +
                 "instead got '" +
-                str(leader) +
+                str( leader ) +
                 "'" )
-            leader_result = main.FALSE
-        withdraw_result = old_leader.election_test_withdraw()
+            leaderResult = main.FALSE
+        withdrawResult = oldLeader.electionTestWithdraw()
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=withdraw_result,
+            actual=withdrawResult,
             onpass="App was withdrawn from election",
             onfail="App was not withdrawn from election" )
 
         main.step( "Make sure new leader is elected" )
-        leader_list = []
-        leaderN = main.ONOScli1.election_test_leader()
+        leaderList = []
+        leaderN = main.ONOScli1.electionTestLeader()
         if leaderN == leader:
             main.log.report( "ONOS still sees " + str( leaderN ) +
                              " as leader after they withdrew" )
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
         elif leaderN == main.FALSE:
             # error in  response
             # TODO: add check for "Command not found:" in the driver, this
             # means the app isn't loaded
-            main.log.report( "Something is wrong with election_test_leader " +
+            main.log.report( "Something is wrong with electionTestLeader " +
                              "function, check the error logs" )
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
         elif leaderN is None:
             main.log.info(
                 "There is no leader after the app withdrew from election" )
-        if leader_result:
-            main.log.report( "Leadership election tests passed(There is no " +
-                             "leader after the old leader resigned)" )
+        if leaderResult:
+            main.log.report( "Leadership election tests passed( There is no " +
+                             "leader after the old leader resigned )" )
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=leader_result,
+            actual=leaderResult,
             onpass="Leadership election passed",
             onfail="Something went wrong with Leadership election" )
 
         main.step(
-            "Run for election on old leader(just so everyone is in the hat)" )
-        run_result = old_leader.election_test_run()
+            "Run for election on old leader( just so everyone is in the hat )" )
+        runResult = oldLeader.electionTestRun()
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=run_result,
+            actual=runResult,
             onpass="App re-ran for election",
             onfail="App failed to run for election" )
-        leader = main.ONOScli1.election_test_leader()
+        leader = main.ONOScli1.electionTestLeader()
         # verify leader is ONOS1
-        if leader == ONOS1_ip:
-            leader_result = main.TRUE
+        if leader == ONOS1Ip:
+            leaderResult = main.TRUE
         else:
-            leader_result = main.FALSE
+            leaderResult = main.FALSE
         # TODO: assert on  run and withdraw results?
 
         utilities.assert_equals(
             expect=main.TRUE,
-            actual=leader_result,
+            actual=leaderResult,
             onpass="Leadership election passed",
             onfail="ONOS1's election app was not leader after it re-ran " +
                    "for election" )