diff --git a/src/cpu/o3/alpha_cpu.hh b/src/cpu/o3/alpha_cpu.hh
index 4daa8b3ba..55b975142 100644
--- a/src/cpu/o3/alpha_cpu.hh
+++ b/src/cpu/o3/alpha_cpu.hh
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#ifndef __CPU_O3_ALPHA_FULL_CPU_HH__
-#define __CPU_O3_ALPHA_FULL_CPU_HH__
+#ifndef __CPU_O3_ALPHA_CPU_HH__
+#define __CPU_O3_ALPHA_CPU_HH__
 
 #include "arch/isa_traits.hh"
 #include "cpu/thread_context.hh"
@@ -431,4 +431,4 @@ class AlphaO3CPU : public FullO3CPU<Impl>
     bool lockFlag;
 };
 
-#endif // __CPU_O3_ALPHA_FULL_CPU_HH__
+#endif // __CPU_O3_ALPHA_CPU_HH__
diff --git a/util/rundiff b/util/rundiff
index 533f448b1..c34bb53a3 100755
--- a/util/rundiff
+++ b/util/rundiff
@@ -39,7 +39,7 @@
 # "filename" is a pipe (|).  Thus to compare the instruction traces
 # from two versions of m5 (m5a and m5b), you can do this:
 #
-# rundiff 'm5a --trace:flags=InstExec |' 'm5b --trace:flags=InstExec |'
+# rundiff 'm5a --traceflags=InstExec |' 'm5b --traceflags=InstExec |'
 #
 
 use strict;
diff --git a/util/tracediff b/util/tracediff
index f11431293..a7efc260d 100755
--- a/util/tracediff
+++ b/util/tracediff
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright (c) 2003-2005 The Regents of The University of Michigan
+# Copyright (c) 2003-2006 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
 # If you want to pass different arguments to the two instances of m5,
 # you can embed them in the simulator arguments like this:
 #
-# % tracediff "m5.opt --foo.bar=1" "m5.opt --foo.bar=2" [common args]
+# % tracediff "m5.opt --option1" "m5.opt --option2" [common args]
 #
 
 if (@ARGV < 2) {