diff --git a/app/components/admin/search_component.html.erb b/app/components/admin/search_component.html.erb
index af3fe396d..de9f5200b 100644
--- a/app/components/admin/search_component.html.erb
+++ b/app/components/admin/search_component.html.erb
@@ -1,7 +1,7 @@
 <div class="small-12 medium-6">
   <%= form_tag(url, method: :get) do |f| %>
     <div class="input-group">
-        <%= text_field_tag :name_or_email, params[:name_or_email].to_s, placeholder: t("admin.shared.user_search.placeholder") %>
+        <%= text_field_tag :search, search_terms.to_s, placeholder: t("admin.shared.user_search.placeholder") %>
       <div class="input-group-button">
         <%= submit_tag t("admin.shared.user_search.button"), class: "button" %>
       </div>
diff --git a/app/components/admin/search_component.rb b/app/components/admin/search_component.rb
index b78ed1edc..246796c2c 100644
--- a/app/components/admin/search_component.rb
+++ b/app/components/admin/search_component.rb
@@ -4,4 +4,10 @@ class Admin::SearchComponent < ApplicationComponent
   def initialize(url:)
     @url = url
   end
+
+  private
+
+    def search_terms
+      params[:search]
+    end
 end
diff --git a/app/controllers/admin/administrators_controller.rb b/app/controllers/admin/administrators_controller.rb
index 8e77a93e6..8d8a5c741 100644
--- a/app/controllers/admin/administrators_controller.rb
+++ b/app/controllers/admin/administrators_controller.rb
@@ -6,7 +6,7 @@ class Admin::AdministratorsController < Admin::BaseController
   end
 
   def search
-    @users = User.search(params[:name_or_email])
+    @users = User.search(params[:search])
                  .includes(:administrator)
                  .page(params[:page])
                  .for_render
diff --git a/app/controllers/admin/managers_controller.rb b/app/controllers/admin/managers_controller.rb
index e001d5b72..4161a9a97 100644
--- a/app/controllers/admin/managers_controller.rb
+++ b/app/controllers/admin/managers_controller.rb
@@ -6,7 +6,7 @@ class Admin::ManagersController < Admin::BaseController
   end
 
   def search
-    @users = User.search(params[:name_or_email])
+    @users = User.search(params[:search])
                  .includes(:manager)
                  .page(params[:page])
                  .for_render
diff --git a/app/controllers/admin/moderators_controller.rb b/app/controllers/admin/moderators_controller.rb
index 8d7508a12..ece34b1fb 100644
--- a/app/controllers/admin/moderators_controller.rb
+++ b/app/controllers/admin/moderators_controller.rb
@@ -6,7 +6,7 @@ class Admin::ModeratorsController < Admin::BaseController
   end
 
   def search
-    @users = User.search(params[:name_or_email])
+    @users = User.search(params[:search])
                  .includes(:moderator)
                  .page(params[:page])
                  .for_render
diff --git a/app/controllers/admin/officials_controller.rb b/app/controllers/admin/officials_controller.rb
index 1b96a9365..1fd3adaa9 100644
--- a/app/controllers/admin/officials_controller.rb
+++ b/app/controllers/admin/officials_controller.rb
@@ -4,7 +4,7 @@ class Admin::OfficialsController < Admin::BaseController
   end
 
   def search
-    @users = User.search(params[:name_or_email]).page(params[:page]).for_render
+    @users = User.search(params[:search]).page(params[:page]).for_render
   end
 
   def edit
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index 1a5367286..695cf0996 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -12,7 +12,7 @@ class Admin::OrganizationsController < Admin::BaseController
 
   def search
     @organizations = Organization.includes(:user)
-                                 .search(params[:term])
+                                 .search(params[:search])
                                  .order("users.created_at", :name, "users.email")
                                  .page(params[:page])
   end
diff --git a/app/controllers/admin/poll/officers_controller.rb b/app/controllers/admin/poll/officers_controller.rb
index 9cf752126..3b926622d 100644
--- a/app/controllers/admin/poll/officers_controller.rb
+++ b/app/controllers/admin/poll/officers_controller.rb
@@ -6,7 +6,7 @@ class Admin::Poll::OfficersController < Admin::Poll::BaseController
   end
 
   def search
-    @user = User.find_by(email: params[:email])
+    @user = User.find_by(email: params[:search])
 
     respond_to do |format|
       if @user
diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb
index fdfaab799..067090426 100644
--- a/app/controllers/admin/valuators_controller.rb
+++ b/app/controllers/admin/valuators_controller.rb
@@ -10,7 +10,7 @@ class Admin::ValuatorsController < Admin::BaseController
   end
 
   def search
-    @users = User.search(params[:name_or_email])
+    @users = User.search(params[:search])
                  .includes(:valuator)
                  .page(params[:page])
                  .for_render
diff --git a/app/controllers/admin/verifications_controller.rb b/app/controllers/admin/verifications_controller.rb
index 939add888..3e3671ec3 100644
--- a/app/controllers/admin/verifications_controller.rb
+++ b/app/controllers/admin/verifications_controller.rb
@@ -4,7 +4,7 @@ class Admin::VerificationsController < Admin::BaseController
   end
 
   def search
-    @users = User.incomplete_verification.search(params[:name_or_email])
+    @users = User.incomplete_verification.search(params[:search])
                                          .page(params[:page])
                                          .for_render
     render :index
diff --git a/app/controllers/moderation/users_controller.rb b/app/controllers/moderation/users_controller.rb
index f07268348..2c958eda8 100644
--- a/app/controllers/moderation/users_controller.rb
+++ b/app/controllers/moderation/users_controller.rb
@@ -21,7 +21,7 @@ class Moderation::UsersController < Moderation::BaseController
   private
 
     def load_users
-      @users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
+      @users = User.with_hidden.search(params[:search]).page(params[:page]).for_render
     end
 
     def block_user
diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb
index b1110488a..8716668eb 100644
--- a/app/views/admin/organizations/index.html.erb
+++ b/app/views/admin/organizations/index.html.erb
@@ -3,7 +3,7 @@
 <div class="small-12 medium-6">
   <%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %>
     <div class="input-group">
-      <%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %>
+      <%= text_field_tag :search, "", placeholder: t("admin.organizations.index.search_placeholder") %>
 
       <div class="input-group-button">
         <%= f.submit t("admin.organizations.index.search"), class: "button" %>
diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb
index 2e534d052..7d2cdb263 100644
--- a/app/views/admin/organizations/search.html.erb
+++ b/app/views/admin/organizations/search.html.erb
@@ -3,7 +3,7 @@
 <div class="small-12 medium-6">
   <%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %>
     <div class="input-group">
-      <%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %>
+      <%= text_field_tag :search, "", placeholder: t("admin.organizations.index.search_placeholder") %>
       <div class="input-group-button">
         <%= f.submit t("admin.organizations.index.search"), class: "button" %>
       </div>
diff --git a/app/views/admin/poll/officers/_search.html.erb b/app/views/admin/poll/officers/_search.html.erb
index 4e5574d07..e61d9a73b 100644
--- a/app/views/admin/poll/officers/_search.html.erb
+++ b/app/views/admin/poll/officers/_search.html.erb
@@ -2,7 +2,7 @@
 
 <%= form_tag search_admin_officers_path, method: :get, remote: true  do %>
   <div class="input-group">
-    <%= text_field_tag :email, "",
+    <%= text_field_tag :search, "",
                        placeholder: t("admin.poll_officers.search.email_placeholder") %>
     <div class="input-group-button">
       <%= submit_tag t("admin.poll_officers.search.search"), class: "button" %>
diff --git a/app/views/moderation/users/index.html.erb b/app/views/moderation/users/index.html.erb
index c7fcf502b..06403279e 100644
--- a/app/views/moderation/users/index.html.erb
+++ b/app/views/moderation/users/index.html.erb
@@ -3,7 +3,7 @@
 <%= form_for(User.new, url: moderation_users_path, as: :user, method: :get) do |f| %>
   <div class="row">
     <div class="small-12 medium-6 column">
-      <%= text_field_tag :name_or_email, "", placeholder: t("moderation.users.index.search_placeholder") %>
+      <%= text_field_tag :search, "", placeholder: t("moderation.users.index.search_placeholder") %>
     </div>
     <div class="small-12 medium-6 column">
       <%= f.submit t("moderation.users.index.search"), class: "button success" %>
diff --git a/spec/controllers/moderation/users_controller_spec.rb b/spec/controllers/moderation/users_controller_spec.rb
index 424e41c8b..1699c9c4e 100644
--- a/spec/controllers/moderation/users_controller_spec.rb
+++ b/spec/controllers/moderation/users_controller_spec.rb
@@ -7,9 +7,9 @@ describe Moderation::UsersController do
     it "keeps query parameters while using protected redirects" do
       user = create(:user, email: "user@consul.dev")
 
-      get :hide_in_moderation_screen, params: { id: user, name_or_email: "user@consul.dev", host: "evil.dev" }
+      get :hide_in_moderation_screen, params: { id: user, search: "user@consul.dev", host: "evil.dev" }
 
-      expect(response).to redirect_to "/moderation/users?name_or_email=user%40consul.dev"
+      expect(response).to redirect_to "/moderation/users?search=user%40consul.dev"
     end
   end
 end
diff --git a/spec/system/admin/activity_spec.rb b/spec/system/admin/activity_spec.rb
index d83c29d9f..0accba34a 100644
--- a/spec/system/admin/activity_spec.rb
+++ b/spec/system/admin/activity_spec.rb
@@ -223,7 +223,7 @@ describe "Admin activity" do
     scenario "Shows moderation activity from moderation screen" do
       user = create(:user)
 
-      visit moderation_users_path(name_or_email: user.username)
+      visit moderation_users_path(search: user.username)
 
       within("#moderation_users") do
         click_link "Block"
diff --git a/spec/system/admin/administrators_spec.rb b/spec/system/admin/administrators_spec.rb
index 078e42635..c8da6fc80 100644
--- a/spec/system/admin/administrators_spec.rb
+++ b/spec/system/admin/administrators_spec.rb
@@ -19,7 +19,7 @@ describe "Admin administrators" do
   end
 
   scenario "Create Administrator", :js do
-    fill_in "name_or_email", with: user.email
+    fill_in "search", with: user.email
     click_button "Search"
 
     expect(page).to have_content user.name
@@ -66,7 +66,7 @@ describe "Admin administrators" do
       expect(page).to have_content(administrator1.name)
       expect(page).to have_content(administrator2.name)
 
-      fill_in "name_or_email", with: " "
+      fill_in "search", with: " "
       click_button "Search"
 
       expect(page).to have_content("Administrators: User search")
@@ -79,11 +79,11 @@ describe "Admin administrators" do
       expect(page).to have_content(administrator1.name)
       expect(page).to have_content(administrator2.name)
 
-      fill_in "name_or_email", with: "Sumn"
+      fill_in "search", with: "Sumn"
       click_button "Search"
 
       expect(page).to have_content("Administrators: User search")
-      expect(page).to have_field "name_or_email", with: "Sumn"
+      expect(page).to have_field "search", with: "Sumn"
       expect(page).to have_content(administrator1.name)
       expect(page).not_to have_content(administrator2.name)
     end
@@ -92,11 +92,11 @@ describe "Admin administrators" do
       expect(page).to have_content(administrator1.email)
       expect(page).to have_content(administrator2.email)
 
-      fill_in "name_or_email", with: administrator2.email
+      fill_in "search", with: administrator2.email
       click_button "Search"
 
       expect(page).to have_content("Administrators: User search")
-      expect(page).to have_field "name_or_email", with: administrator2.email
+      expect(page).to have_field "search", with: administrator2.email
       expect(page).to have_content(administrator2.email)
       expect(page).not_to have_content(administrator1.email)
     end
diff --git a/spec/system/admin/managers_spec.rb b/spec/system/admin/managers_spec.rb
index fd14946b5..6b46fa15e 100644
--- a/spec/system/admin/managers_spec.rb
+++ b/spec/system/admin/managers_spec.rb
@@ -15,7 +15,7 @@ describe "Admin managers", :admin do
   end
 
   scenario "Create Manager", :js do
-    fill_in "name_or_email", with: user.email
+    fill_in "search", with: user.email
     click_button "Search"
 
     expect(page).to have_content user.name
@@ -47,7 +47,7 @@ describe "Admin managers", :admin do
       expect(page).to have_content(manager1.name)
       expect(page).to have_content(manager2.name)
 
-      fill_in "name_or_email", with: " "
+      fill_in "search", with: " "
       click_button "Search"
 
       expect(page).to have_content("Managers: User search")
@@ -60,11 +60,11 @@ describe "Admin managers", :admin do
       expect(page).to have_content(manager1.name)
       expect(page).to have_content(manager2.name)
 
-      fill_in "name_or_email", with: "Taylor"
+      fill_in "search", with: "Taylor"
       click_button "Search"
 
       expect(page).to have_content("Managers: User search")
-      expect(page).to have_field "name_or_email", with: "Taylor"
+      expect(page).to have_field "search", with: "Taylor"
       expect(page).to have_content(manager1.name)
       expect(page).not_to have_content(manager2.name)
     end
@@ -73,11 +73,11 @@ describe "Admin managers", :admin do
       expect(page).to have_content(manager1.email)
       expect(page).to have_content(manager2.email)
 
-      fill_in "name_or_email", with: manager2.email
+      fill_in "search", with: manager2.email
       click_button "Search"
 
       expect(page).to have_content("Managers: User search")
-      expect(page).to have_field "name_or_email", with: manager2.email
+      expect(page).to have_field "search", with: manager2.email
       expect(page).to have_content(manager2.email)
       expect(page).not_to have_content(manager1.email)
     end
diff --git a/spec/system/admin/moderators_spec.rb b/spec/system/admin/moderators_spec.rb
index dd97a65fa..df1af19b4 100644
--- a/spec/system/admin/moderators_spec.rb
+++ b/spec/system/admin/moderators_spec.rb
@@ -15,7 +15,7 @@ describe "Admin moderators", :admin do
   end
 
   scenario "Create Moderator", :js do
-    fill_in "name_or_email", with: user.email
+    fill_in "search", with: user.email
     click_button "Search"
 
     expect(page).to have_content user.name
@@ -47,7 +47,7 @@ describe "Admin moderators", :admin do
       expect(page).to have_content(moderator1.name)
       expect(page).to have_content(moderator2.name)
 
-      fill_in "name_or_email", with: " "
+      fill_in "search", with: " "
       click_button "Search"
 
       expect(page).to have_content("Moderators: User search")
@@ -60,11 +60,11 @@ describe "Admin moderators", :admin do
       expect(page).to have_content(moderator1.name)
       expect(page).to have_content(moderator2.name)
 
-      fill_in "name_or_email", with: "Eliz"
+      fill_in "search", with: "Eliz"
       click_button "Search"
 
       expect(page).to have_content("Moderators: User search")
-      expect(page).to have_field "name_or_email", with: "Eliz"
+      expect(page).to have_field "search", with: "Eliz"
       expect(page).to have_content(moderator1.name)
       expect(page).not_to have_content(moderator2.name)
     end
@@ -73,11 +73,11 @@ describe "Admin moderators", :admin do
       expect(page).to have_content(moderator1.email)
       expect(page).to have_content(moderator2.email)
 
-      fill_in "name_or_email", with: moderator2.email
+      fill_in "search", with: moderator2.email
       click_button "Search"
 
       expect(page).to have_content("Moderators: User search")
-      expect(page).to have_field "name_or_email", with: moderator2.email
+      expect(page).to have_field "search", with: moderator2.email
       expect(page).to have_content(moderator2.email)
       expect(page).not_to have_content(moderator1.email)
     end
diff --git a/spec/system/admin/officials_spec.rb b/spec/system/admin/officials_spec.rb
index 2b1e18331..2cd86c085 100644
--- a/spec/system/admin/officials_spec.rb
+++ b/spec/system/admin/officials_spec.rb
@@ -38,7 +38,7 @@ describe "Admin officials", :admin do
 
   scenario "Create an official" do
     visit admin_officials_path
-    fill_in "name_or_email", with: citizen.email
+    fill_in "search", with: citizen.email
     click_button "Search"
 
     expect(page).to have_current_path(search_admin_officials_path, ignore_query: true)
diff --git a/spec/system/admin/organizations_spec.rb b/spec/system/admin/organizations_spec.rb
index 86548e846..7f2d400df 100644
--- a/spec/system/admin/organizations_spec.rb
+++ b/spec/system/admin/organizations_spec.rb
@@ -36,7 +36,7 @@ describe "Admin::Organizations" do
       visit admin_organizations_path
       expect(page).to have_content("Get up, Stand up")
 
-      fill_in "term", with: "      "
+      fill_in "search", with: "      "
       click_button "Search"
 
       expect(page).to have_current_path(search_admin_organizations_path, ignore_query: true)
@@ -49,7 +49,7 @@ describe "Admin::Organizations" do
       visit search_admin_organizations_path
       expect(page).not_to have_content("Get up, Stand up")
 
-      fill_in "term", with: "Up, sta"
+      fill_in "search", with: "Up, sta"
       click_button "Search"
 
       within("#search-results") do
@@ -61,7 +61,7 @@ describe "Admin::Organizations" do
       visit search_admin_organizations_path
       expect(page).not_to have_content("Get up, Stand up")
 
-      fill_in "term", with: user.email
+      fill_in "search", with: user.email
       click_button "Search"
 
       within("#search-results") do
@@ -73,7 +73,7 @@ describe "Admin::Organizations" do
       visit search_admin_organizations_path
       expect(page).not_to have_content("Get up, Stand up")
 
-      fill_in "term", with: user.phone_number
+      fill_in "search", with: user.phone_number
       click_button "Search"
 
       within("#search-results") do
diff --git a/spec/system/admin/poll/officers_spec.rb b/spec/system/admin/poll/officers_spec.rb
index 51d2fd506..cf08b95a0 100644
--- a/spec/system/admin/poll/officers_spec.rb
+++ b/spec/system/admin/poll/officers_spec.rb
@@ -15,7 +15,7 @@ describe "Admin poll officers", :admin do
   end
 
   scenario "Create", :js do
-    fill_in "email", with: user.email
+    fill_in "search", with: user.email
     click_button "Search"
 
     expect(page).to have_content user.name
diff --git a/spec/system/admin/valuators_spec.rb b/spec/system/admin/valuators_spec.rb
index 23233b344..f5108dd63 100644
--- a/spec/system/admin/valuators_spec.rb
+++ b/spec/system/admin/valuators_spec.rb
@@ -22,7 +22,7 @@ describe "Admin valuators", :admin do
   end
 
   scenario "Create", :js do
-    fill_in "name_or_email", with: user.email
+    fill_in "search", with: user.email
     click_button "Search"
 
     expect(page).to have_content(user.name)
@@ -72,7 +72,7 @@ describe "Admin valuators", :admin do
       expect(page).to have_content(valuator1.name)
       expect(page).to have_content(valuator2.name)
 
-      fill_in "name_or_email", with: " "
+      fill_in "search", with: " "
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
@@ -85,11 +85,11 @@ describe "Admin valuators", :admin do
       expect(page).to have_content(valuator1.name)
       expect(page).to have_content(valuator2.name)
 
-      fill_in "name_or_email", with: "Foster"
+      fill_in "search", with: "Foster"
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
-      expect(page).to have_field "name_or_email", with: "Foster"
+      expect(page).to have_field "search", with: "Foster"
       expect(page).to have_content(valuator1.name)
       expect(page).not_to have_content(valuator2.name)
     end
@@ -98,11 +98,11 @@ describe "Admin valuators", :admin do
       expect(page).to have_content(valuator1.email)
       expect(page).to have_content(valuator2.email)
 
-      fill_in "name_or_email", with: valuator2.email
+      fill_in "search", with: valuator2.email
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
-      expect(page).to have_field "name_or_email", with: valuator2.email
+      expect(page).to have_field "search", with: valuator2.email
       expect(page).to have_content(valuator2.email)
       expect(page).not_to have_content(valuator1.email)
     end
diff --git a/spec/system/admin/verifications_spec.rb b/spec/system/admin/verifications_spec.rb
index 69bb37fb2..98961a571 100644
--- a/spec/system/admin/verifications_spec.rb
+++ b/spec/system/admin/verifications_spec.rb
@@ -22,7 +22,7 @@ describe "Incomplete verifications", :admin do
 
     visit admin_verifications_path
 
-    fill_in "name_or_email", with: "juan"
+    fill_in "search", with: "juan"
     click_button "Search"
 
     expect(page).to have_content("Juan_anonymous")
diff --git a/spec/system/moderation/users_spec.rb b/spec/system/moderation/users_spec.rb
index d05951eae..62a72d59a 100644
--- a/spec/system/moderation/users_spec.rb
+++ b/spec/system/moderation/users_spec.rb
@@ -58,7 +58,7 @@ describe "Moderate users" do
     visit moderation_users_path
 
     expect(page).not_to have_content citizen.name
-    fill_in "name_or_email", with: "Wanda"
+    fill_in "search", with: "Wanda"
     click_button "Search"
 
     within("#moderation_users") do