diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index ce2750b071..90349a0759 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -59,7 +59,7 @@ module Ci
     #
     # Returns an ActiveRecord::Relation.
     def self.search(query)
-      t = Ci::Runner.arel_table
+      t = arel_table
       pattern = "%#{query}%"
 
       where(t[:token].matches(pattern).or(t[:description].matches(pattern)))
diff --git a/app/models/group.rb b/app/models/group.rb
index bfeddf8b4d..afbc292201 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -41,7 +41,7 @@ class Group < Namespace
     #
     # Returns an ActiveRecord::Relation.
     def search(query)
-      table   = Group.arel_table
+      table   = Namespace.arel_table
       pattern = "%#{query}%"
 
       where(table[:name].matches(pattern).or(table[:path].matches(pattern)))
diff --git a/app/models/note.rb b/app/models/note.rb
index 76e86fdbca..8b0610ff77 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -113,7 +113,7 @@ class Note < ActiveRecord::Base
     #
     # Returns an ActiveRecord::Relation.
     def search(query)
-      table   = Note.arel_table
+      table   = arel_table
       pattern = "%#{query}%"
 
       where(table[:note].matches(pattern))
diff --git a/app/models/project.rb b/app/models/project.rb
index cb236bf41c..ce103398a9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -274,7 +274,7 @@ class Project < ActiveRecord::Base
     #
     # query - The search query as a String.
     def search(query)
-      ptable  = Project.arel_table
+      ptable  = arel_table
       ntable  = Namespace.arel_table
       pattern = "%#{query}%"
 
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 35d05af38b..b9e835a448 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -121,7 +121,7 @@ class Snippet < ActiveRecord::Base
     #
     # Returns an ActiveRecord::Relation.
     def search(query)
-      t = Snippet.arel_table
+      t = arel_table
       pattern = "%#{query}%"
 
       where(t[:title].matches(pattern).or(t[:file_name].matches(pattern)))
diff --git a/app/models/user.rb b/app/models/user.rb
index 725f748faf..101303e1f1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -294,7 +294,7 @@ class User < ActiveRecord::Base
     #
     # Returns an ActiveRecord::Relation.
     def search(query)
-      table   = User.arel_table
+      table   = arel_table
       pattern = "%#{query}%"
 
       where(