diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index 94f7580f0ea..82c621b29e4 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ContainerRegistryController < Projects::ApplicationController
-  before_action :authorize_read_image!
-  before_action :authorize_update_image!, only: [:destroy]
+  before_action :authorize_read_container_registry!
+  before_action :authorize_update_container_registry!, only: [:destroy]
   before_action :tag, except: [:index]
   layout 'project'
 
@@ -23,6 +23,6 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
   end
 
   def tag
-    @tag ||= container_registry[params[:id]]
+    @tag ||= container_registry_repository[params[:id]]
   end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a76b5e22600..664fdb6d745 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,8 +152,8 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
-    if can?(current_user, :read_image, project)
-      nav_tabs << :images
+    if can?(current_user, :read_container_registry, project)
+      nav_tabs << :container_registry
     end
 
     if can?(current_user, :admin_project, project)
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 8448599c1cc..d3d715aad3b 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -46,9 +46,9 @@
           Builds
           %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
-  - if project_nav_tab? :images
+  - if project_nav_tab? :container_registry
     = nav_link(controller: %w(container_registry)) do
-      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-images' do
+      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
         = icon('hdd-o fw')
         %span
           Container Registry