diff -r 3c4c00b8c488 -r 7ed5f6faed2b src/python/m5/debug.py
--- a/src/python/m5/debug.py	Thu Oct 17 18:33:24 2013 +0100
+++ b/src/python/m5/debug.py	Thu Oct 17 18:33:25 2013 +0100
@@ -31,7 +31,7 @@
 import internal
 
 from internal.debug import SimpleFlag, CompoundFlag
-from internal.debug import schedBreakCycle, setRemoteGDBPort
+from internal.debug import schedBreak, setRemoteGDBPort
 from m5.util import printList
 
 def help():
diff -r 3c4c00b8c488 -r 7ed5f6faed2b src/python/m5/main.py
--- a/src/python/m5/main.py	Thu Oct 17 18:33:24 2013 +0100
+++ b/src/python/m5/main.py	Thu Oct 17 18:33:25 2013 +0100
@@ -95,23 +95,20 @@
     # Debugging options
     group("Debugging Options")
     option("--debug-break", metavar="TIME[,TIME]", action='append', split=',',
-        help="Cycle to create a breakpoint")
+        help="Tick to create a breakpoint")
     option("--debug-help", action='store_true',
-        help="Print help on trace flags")
+        help="Print help on debug flags")
     option("--debug-flags", metavar="FLAG[,FLAG]", action='append', split=',',
-        help="Sets the flags for tracing (-FLAG disables a flag)")
+        help="Sets the flags for debug output (-FLAG disables a flag)")
+    option("--debug-start", metavar="TIME", type='int',
+        help="Start debug output at TIME (must be in ticks)")
+    option("--debug-file", metavar="FILE", default="cout",
+        help="Sets the output file for debug [Default: %default]")
+    option("--debug-ignore", metavar="EXPR", action='append', split=':',
+        help="Ignore EXPR sim objects")
     option("--remote-gdb-port", type='int', default=7000,
         help="Remote gdb base port (set to 0 to disable listening)")
 
-    # Tracing options
-    group("Trace Options")
-    option("--trace-start", metavar="TIME", type='int',
-        help="Start tracing at TIME (must be in ticks)")
-    option("--trace-file", metavar="FILE", default="cout",
-        help="Sets the output file for tracing [Default: %default]")
-    option("--trace-ignore", metavar="EXPR", action='append', split=':',
-        help="Ignore EXPR sim objects")
-
     # Help options
     group("Help Options")
     option("--list-sim-objects", action='store_true', default=False,
@@ -316,7 +313,7 @@
     # set debugging options
     debug.setRemoteGDBPort(options.remote_gdb_port)
     for when in options.debug_break:
-        debug.schedBreakCycle(int(when))
+        debug.schedBreak(int(when))
 
     if options.debug_flags:
         check_tracing()
diff -r 3c4c00b8c488 -r 7ed5f6faed2b src/sim/debug.hh
--- a/src/sim/debug.hh	Thu Oct 17 18:33:24 2013 +0100
+++ b/src/sim/debug.hh	Thu Oct 17 18:33:25 2013 +0100
@@ -40,9 +40,9 @@
 
 
 /** Cause the simulator to execute a breakpoint
- * @param when the cycle to break
+ * @param when the tick to break
  */
-void schedBreakCycle(Tick when);
+void schedBreak(Tick when);
 
 /** Cause the simulator to return to python to create a checkpoint
  * @param when the cycle to break
diff -r 3c4c00b8c488 -r 7ed5f6faed2b src/sim/debug.cc
--- a/src/sim/debug.cc	Thu Oct 17 18:33:24 2013 +0100
+++ b/src/sim/debug.cc	Thu Oct 17 18:33:25 2013 +0100
@@ -82,7 +82,7 @@
 // (callable from debugger)
 //
 void
-schedBreakCycle(Tick when)
+schedBreak(Tick when)
 {
     mainEventQueue.schedule(new DebugBreakEvent, when);
     warn("need to stop all queues");