diff --git a/app/controllers/configurations_controller.rb b/app/controllers/configurations_controller.rb
--- a/app/controllers/configurations_controller.rb
+++ b/app/controllers/configurations_controller.rb
@@ -3,9 +3,9 @@
   before_filter :authenticate
   before_filter { |controller| controller.authorization_by_roles(['admin'])}
 
-  in_place_edit_for :configuration, :key
-  in_place_edit_for :configuration, :type
-  in_place_edit_for :configuration, :value
+  in_place_edit_for :grader_configuration, :key
+  in_place_edit_for :grader_configuration, :type
+  in_place_edit_for :grader_configuration, :value
 
   def index
     @configurations = GraderConfiguration.find(:all,
diff --git a/app/views/configurations/index.html.haml b/app/views/configurations/index.html.haml
--- a/app/views/configurations/index.html.haml
+++ b/app/views/configurations/index.html.haml
@@ -7,14 +7,14 @@
     %th Value
     %th Description
   - @configurations.each do |conf|
-    - @configuration = conf
+    - @grader_configuration = conf
     %tr{:class => cycle("info-odd", "info-even")}
       %td
-        = in_place_editor_field :configuration, :key, {}, :rows=>1
+        = in_place_editor_field :grader_configuration, :key, {}, :rows=>1
       %td
-        = in_place_editor_field :configuration, :value_type, {}, :rows=>1
+        = in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
       %td
-        = in_place_editor_field :configuration, :value, {}, :rows=>1
+        = in_place_editor_field :grader_configuration, :value, {}, :rows=>1
       %td= conf.description
 
 - if GraderConfiguration.config_cached?
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -8,7 +8,7 @@
 = error_messages_for :user, :header_message => (t 'registration.errors.header')
 
 %table
-  = form_for :user, @user, :url => { :action => 'register' } do |f|
+  = form_for @user, :url => { :action => 'register' } do |f|
     %tr
       %td{:align => "right"}
         = "#{t 'login_label'}:"