diff --git a/bin/mn b/bin/mn
index a314afe..d0b0b6b 100644
--- a/bin/mn
+++ b/bin/mn
@@ -57,8 +57,8 @@ CONTROLLERS = { 'ref': Controller,
                'none': lambda a, b: None }
 
 # optional tests to run
-TESTS = [ 'cli', 'build', 'ping_all', 'ping_pair', 'iperf', 'all',
-    'iperf_udp' ]
+TESTS = [ 'cli', 'build', 'pingAll', 'pingPair', 'iperf', 'all',
+    'iperfUdp' ]
 
 
 def addDictOption( opts, choicesDict, default, name, helpStr=None ):
@@ -120,7 +120,7 @@ class MininetRunner( object ):
         opts.add_option( '--port', type='string', default=6633,
                         help='[port integer for a listening remote'
                         ' controller]' )
-        opts.add_option( '--in_namespace', action='store_true',
+        opts.add_option( '--inNamespace', action='store_true',
                         default=False, help='sw and ctrl in namespace?' )
         self.options = opts.parse_args()[ 0 ]
 
diff --git a/mininet/cli.py b/mininet/cli.py
index 8adeb9e..20d843b 100644
--- a/mininet/cli.py
+++ b/mininet/cli.py
@@ -46,8 +46,8 @@ from mininet.log import lg
 class CLI( object ):
     "Simple command-line interface to talk to nodes."
 
-    cmds = [ '?', 'help', 'nodes', 'net', 'sh', 'ping_all', 'exit',
-            'ping_pair', 'iperf', 'iperf_udp', 'intfs', 'dump' ]
+    cmds = [ '?', 'help', 'nodes', 'net', 'sh', 'pingAll', 'exit',
+            'pingPair', 'iperf', 'iperfUdp', 'intfs', 'dump' ]
 
     def __init__( self, mininet ):
         self.mn = mininet