diff --git a/lib/github/build/action.rb b/lib/github/build/action.rb
index 51cc098..4b2981d 100644
--- a/lib/github/build/action.rb
+++ b/lib/github/build/action.rb
@@ -181,7 +181,8 @@ def initial_output(ci_job)
       end
 
       def stage_name(stage_config)
-        return stage_config.github_check_run_name if @check_suite.pull_request.plans.count == 1
+        return stage_config.github_check_run_name if @check_suite.pull_request.plans.count == 1 or @name.blank?
+        return stage_config.github_check_run_name unless GitHubApp::Configuration.instance.multi_plan?
 
         "#{stage_config.github_check_run_name} - #{@name}"
       end
diff --git a/lib/helpers/configuration.rb b/lib/helpers/configuration.rb
index 7503365..b71f095 100644
--- a/lib/helpers/configuration.rb
+++ b/lib/helpers/configuration.rb
@@ -27,6 +27,10 @@ def debug?
       config.key? 'debug' and config['debug']
     end
 
+    def multi_plan?
+      config.key? 'multi_plan?' and config['multi_plan?']
+    end
+
     def ci_url
       return @config['ci']['url'] if @config.key?('ci') && @config['ci'].key?('url')