diff --git a/app/controllers/concerns/commentable.rb b/app/controllers/concerns/commentable.rb
index ac8b40460..699ae9412 100644
--- a/app/controllers/concerns/commentable.rb
+++ b/app/controllers/concerns/commentable.rb
@@ -63,11 +63,7 @@ module Commentable
     end
 
     def resource_name
-      @resource_name ||= resource_class.to_s.downcase.singularize
-    end
-
-    def resource_model
-      @resource_model ||= resource_name.capitalize.constantize
+      @resource_name ||= resource_model.to_s.downcase.singularize
     end
 
     def set_resource_instance
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index f50827120..52d588248 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -22,7 +22,7 @@ class DebatesController < ApplicationController
       params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
-    def resource_class
+    def resource_model
       Debate
     end
 
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 7a90773fb..c491b55ba 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -22,7 +22,7 @@ class ProposalsController < ApplicationController
       params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
-    def resource_class
+    def resource_model
       Proposal
     end
 end