diff --git a/app/models/site_customization/content_block.rb b/app/models/site_customization/content_block.rb
index 81cd842fa..01d2206b6 100644
--- a/app/models/site_customization/content_block.rb
+++ b/app/models/site_customization/content_block.rb
@@ -1,5 +1,5 @@
 class SiteCustomization::ContentBlock < ActiveRecord::Base
-  VALID_BLOCKS = %w(top_links footer subnavigation_before subnavigation_after)
+  VALID_BLOCKS = %w(top_links footer main_navigation_left main_navigation_right)
 
   validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) }
   validates :name, presence: true, uniqueness: { scope: :locale }, inclusion: { in: VALID_BLOCKS }
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index d64d412d4..3336dad0a 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -1,6 +1,6 @@
 <div class="small-12 medium-9 column">
   <ul>
-    <%= raw content_block("subnavigation_before", I18n.locale) %>
+    <%= raw content_block("main_navigation_left", I18n.locale) %>
 
     <% if feature?(:debates) %>
       <li>
@@ -62,6 +62,6 @@
                     title: t("shared.go_to_page") + t("layouts.header.help") %>
     </li>
     
-    <%= raw content_block("subnavigation_after", I18n.locale) %>
+    <%= raw content_block("main_navigation_right", I18n.locale) %>
   </ul>
 </div>