diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 0c4876358bdc17b823b50ce35579fc1f63816840..b86719008620cc9dfd0aa4f47cd50635c94ca1bd 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -84,14 +84,14 @@ class @SearchAutocomplete
         if event.keyCode is @keyCode.ENTER
           @goToResult(ui.item)
         else
-          # Pressing tab sets the scope
-          if event.keyCode is @keyCode.TAB and ui.item.scope?
+          # Pressing tab sets the location
+          if event.keyCode is @keyCode.TAB and ui.item.location?
             @setLocationBadge(ui.item)
             @searchInput
               .val('') # remove selected value from input
               .focus()
           else
-            # If option is not a scope go to page
+            # If option is not a location go to page
             @goToResult(ui.item)
 
           # Return false to avoid focus on the next element
@@ -153,7 +153,7 @@ class @SearchAutocomplete
     # Reset input states
     @resetSearchState()
 
-    switch item.scope
+    switch item.location
       when 'projects'
         @projectInputEl.val(item.id)
         # @searchCodeInputEl.val('true') # TODO: always true for projects?
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index cbead1b8b747ac6bf2e20a31c73825ef6ea40762..de16454739687d2a31d25e71a77c13dfdc62021e 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -72,7 +72,7 @@ module SearchHelper
     current_user.authorized_groups.search(term).limit(limit).map do |group|
       {
         category: "Groups",
-        scope: "groups",
+        location: "groups",
         id: group.id,
         label: "#{search_result_sanitize(group.name)}",
         url: group_path(group)
@@ -86,7 +86,7 @@ module SearchHelper
       sorted_by_stars.non_archived.limit(limit).map do |p|
       {
         category: "Projects",
-        scope: "projects",
+        location: "projects",
         id: p.id,
         value: "#{search_result_sanitize(p.name)}",
         label: "#{search_result_sanitize(p.name_with_namespace)}",