diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 32c0330f5..cf579627b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -60,7 +60,7 @@
 //= require legislation_annotatable
 //= require watch_form_changes
 //= require followable
-//= require flagable
+//= require flaggable
 //= require documentable
 //= require tree_navigator
 //= require custom
diff --git a/app/assets/javascripts/flagable.js.coffee b/app/assets/javascripts/flagable.js.coffee
deleted file mode 100644
index 417acf1a7..000000000
--- a/app/assets/javascripts/flagable.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-App.Flagable =
-
-  update: (proposal_id, button) ->
-    $("#" + proposal_id + " .js-flag-actions-container").html(button).foundation()
diff --git a/app/assets/javascripts/flaggable.js.coffee b/app/assets/javascripts/flaggable.js.coffee
new file mode 100644
index 000000000..7ada75686
--- /dev/null
+++ b/app/assets/javascripts/flaggable.js.coffee
@@ -0,0 +1,4 @@
+App.Flaggable =
+
+  update: (resource_id, button) ->
+    $("#" + resource_id + " .js-flag-actions").html(button).foundation()
diff --git a/app/views/proposals/_flag_actions.html.erb b/app/views/proposals/_flag_actions.html.erb
index 3e776de66..8aa3e5cf4 100644
--- a/app/views/proposals/_flag_actions.html.erb
+++ b/app/views/proposals/_flag_actions.html.erb
@@ -1,21 +1,19 @@
-<span class="js-flag-actions">
-  <span class="flag-content">
-    <% if show_flag_action? proposal %>
-      <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
-        <span class="icon-flag flag-disable"></span>
-      </a>
-      <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-        <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
-      </span>
-    <% end %>
+<span class="flag-content">
+  <% if show_flag_action? proposal %>
+    <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
+      <span class="icon-flag flag-disable"></span>
+    </a>
+    <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
+      <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
+    </span>
+  <% end %>
 
-    <% if show_unflag_action? proposal %>
-      <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
-        <span class="icon-flag flag-active"></span>
-      </a>
-      <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-        <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
-      </span>
-    <% end %>
-  </span>
+  <% if show_unflag_action? proposal %>
+    <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
+      <span class="icon-flag flag-active"></span>
+    </a>
+    <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
+      <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
+    </span>
+  <% end %>
 </span>
diff --git a/app/views/proposals/_refresh_flag_actions.js.erb b/app/views/proposals/_refresh_flag_actions.js.erb
index 8b563743b..e89e316c2 100644
--- a/app/views/proposals/_refresh_flag_actions.js.erb
+++ b/app/views/proposals/_refresh_flag_actions.js.erb
@@ -1,2 +1,2 @@
-App.Flagable.update("<%= dom_id(@proposal) %>",
+App.Flaggable.update("<%= dom_id(@proposal) %>",
   "<%= j render("proposals/flag_actions", proposal: @proposal) %>")
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 29e26efff..409c9a8aa 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -59,7 +59,7 @@
 
           <% if current_user %>
             <span class="bullet">&nbsp;&bull;&nbsp;</span>
-            <span class="js-flag-actions-container">
+            <span class="js-flag-actions">
               <%= render 'proposals/flag_actions', proposal: @proposal %>
             </span>
           <% end %>