diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 81feca0088f8ed20d9f59afcb215783b147cc1da..a05b3f43f97c4896a2d310200f80ebe2f7d7b87b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -96,10 +96,6 @@ module Ci
       self.when == 'manual'
     end
 
-    def playable_actions
-      pipeline.playable_actions
-    end
-
     def playable?
       project.builds_enabled? && commands.present? && manual?
     end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 5aefe1d16945ce8a56900bd9996312606211f9e5..de9c74194aca693b2f4f0d3e09719e9f4f2edfcc 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -65,8 +65,8 @@ module Ci
       !tag?
     end
 
-    def playable_actions
-      builds.manual_actions.latest
+    def manual_actions
+      builds.latest.manual_actions
     end
 
     def retryable?
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 44dfb67552e7c4d085efa4891e7d348e30ff083b..aa1f7e462d24e823431ec4f50f48629b1b3c9f08 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -33,7 +33,7 @@ class Deployment < ActiveRecord::Base
     project.repository.keep_around(self.sha)
   end
 
-  def playable_actions
-    deployable.try(:playable_actions)
+  def manual_actions
+    deployable.try(:manual_actions)
   end
 end
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 1285fce4930a263038d26bdfee3b69ce2dd03019..b9adc920ea6fbc5f97bcb840eddda51e79b2cb78 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -57,8 +57,8 @@
   %td.pipeline-actions
     .controls.hidden-xs.pull-right
       - artifacts = pipeline.builds.latest.select { |b| b.artifacts? }
-      - playable = pipeline.playable_actions
-      - if artifacts.present? || playable.any?
+      - actions = pipeline.manual_actions
+      - if artifacts.present? || actions.any?
         .btn-group.inline
           - if playable.any?
             .btn-group
@@ -69,7 +69,7 @@
                 %li
                   = link_to play_namespace_project_build_path(@project.namespace, @project, build), rel: 'nofollow' do
                     = icon("play")
-                    %span= playable.name.titleize
+                    %span= actions.name.titleize
           - if artifacts.present?
             .btn-group
               %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'}
diff --git a/app/views/projects/deployments/_playable.html.haml b/app/views/projects/deployments/_playable.html.haml
index 02e4fb7974e55f449d59d7dfdaf16cd508ae1649..4bff21ce7a585e43b81e91192df9acbe16ef6151 100644
--- a/app/views/projects/deployments/_playable.html.haml
+++ b/app/views/projects/deployments/_playable.html.haml
@@ -1,5 +1,5 @@
-- playable = deployment.playable_actions
-- if playable.any?
+- actions = deployment.manual_actions
+- if actions.any?
   .btn-group.inline
     .btn-group
       %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'}
@@ -9,4 +9,4 @@
         %li
           = link_to play_namespace_project_build_path(@project.namespace, @project, build), rel: 'nofollow' do
             = icon("play")
-            %span= playable.name.titleize
+            %span= actions.name.titleize