6 files changed, 8 insertions, 8 deletions
diff --git a/app/serializers/pipeline_action_entity.rb b/app/serializers/build_action_entity.rb
index 8ed4091b139..3e72892d584 100644
--- a/app/serializers/pipeline_action_entity.rb
+++ b/app/serializers/build_action_entity.rb
@@ -1,4 +1,4 @@
-class PipelineActionEntity < Grape::Entity
+class BuildActionEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name do |build|
diff --git a/app/serializers/pipeline_artifact_entity.rb b/app/serializers/build_artifact_entity.rb
index 96f90ff9042..8b643d8e783 100644
--- a/app/serializers/pipeline_artifact_entity.rb
+++ b/app/serializers/build_artifact_entity.rb
@@ -1,4 +1,4 @@
-class PipelineArtifactEntity < Grape::Entity
+class BuildArtifactEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name do |build|
diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb
index 42205476478..d04a4990cb0 100644
--- a/app/serializers/pipeline_entity.rb
+++ b/app/serializers/pipeline_entity.rb
@@ -20,9 +20,9 @@ class PipelineEntity < Grape::Entity
 
     expose :duration
     expose :finished_at
-    expose :stages, using: PipelineStageEntity
-    expose :artifacts, using: PipelineArtifactEntity
-    expose :manual_actions, using: PipelineActionEntity
+    expose :stages, using: StageEntity
+    expose :artifacts, using: BuildArtifactEntity
+    expose :manual_actions, using: BuildActionEntity
   end
 
   expose :flags do
diff --git a/app/serializers/pipeline_stage_entity.rb b/app/serializers/stage_entity.rb
index 5ef39bafdc1..31116988320 100644
--- a/app/serializers/pipeline_stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -1,4 +1,4 @@
-class PipelineStageEntity < Grape::Entity
+class StageEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name
diff --git a/spec/serializers/pipeline_action_entity_spec.rb b/spec/serializers/build_action_entity_spec.rb
index 77fd7d9936f..383704572b1 100644
--- a/spec/serializers/pipeline_action_entity_spec.rb
+++ b/spec/serializers/build_action_entity_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PipelineActionEntity do
+describe BuildActionEntity do
   let(:build) { create(:ci_build, name: 'test_build') }
 
   let(:entity) do
diff --git a/spec/serializers/pipeline_artifact_entity_spec.rb b/spec/serializers/build_artifact_entity_spec.rb
index df8ae6d32ae..2fc60aa9de6 100644
--- a/spec/serializers/pipeline_artifact_entity_spec.rb
+++ b/spec/serializers/build_artifact_entity_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PipelineArtifactEntity do
+describe BuildArtifactEntity do
   let(:build) { create(:ci_build, name: 'test:build') }
 
   let(:entity) do