diff --git a/app/controllers/concerns/commentable.rb b/app/controllers/concerns/commentable.rb
index 364a9fdda..393ab1cb1 100644
--- a/app/controllers/concerns/commentable.rb
+++ b/app/controllers/concerns/commentable.rb
@@ -62,7 +62,7 @@ module Commentable
     end
 
     def commentable_name
-      @commentable_name ||= controller_name.singularize
+      @commentable_name ||= resource_class.to_s.downcase.singularize
     end
 
     def commentable_model
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 2bff1f0f8..f50827120 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -22,4 +22,8 @@ class DebatesController < ApplicationController
       params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
+    def resource_class
+      Debate
+    end
+
 end
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index b5069b184..7a90773fb 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -22,4 +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
+      Proposal
+    end
 end