diff --git a/app/models/grader_message.rb b/app/models/grader_message.rb
--- a/app/models/grader_message.rb
+++ b/app/models/grader_message.rb
@@ -21,17 +21,19 @@
                          :taken => false)
   end
 
-  def self.create_grade_submission(mode,submission)
+  def self.create_grade_submission(submission, 
+                                   grading_environment="grading")
     GraderMessage.create_message(:any,
                                  GraderMessage::GRADE_SUBMISSION,
-                                 mode,
+                                 grading_environment,
                                  submission.id)
   end
   
-  def self.create_grade_test_request(mode,test_request)
+  def self.create_grade_test_request(test_request, 
+                                     grading_environment="grading")
     GraderMessage.create_message(:any,
                                  GraderMessage::GRADE_TEST_REQUEST,
-                                 mode,
+                                 grading_environment,
                                  test_request.id)
   end
   
diff --git a/judge/scripts/grader b/judge/scripts/grader
--- a/judge/scripts/grader
+++ b/judge/scripts/grader
@@ -28,7 +28,7 @@
     raise "Log directory does not exist: #{config.log_dir}"
   end
   config.log_dir + 
-    "/#{GRADER_ENV}_#{config.grader_mode}.#{Process.pid}"
+    "/#{GRADER_ENV}.#{Process.pid}"
 end
 
 def log(str)