diff --git a/tools/ExecuteCIStep.ps1 b/tools/ExecuteCIStep.ps1
index 1cf1024bea36..fb1e147996c8 100644
--- a/tools/ExecuteCIStep.ps1
+++ b/tools/ExecuteCIStep.ps1
@@ -189,11 +189,12 @@ If ($Build)
             {
                 $ModuleInfoList += @{
                     Module = "Az.$ModuleName";
-                    Status = $DependencyStepStatus;
+                    Status = "Running";
                     Content = "";
                 }
             }
             $Detail = @{
+                Platform = $Platform;
                 Modules = $ModuleInfoList;
             }
             $Template.$DependencyStep.Details += $Detail
diff --git a/tools/PipelineResultTemplate.json b/tools/PipelineResultTemplate.json
index 9347ea04bfaf..20c823271da3 100644
--- a/tools/PipelineResultTemplate.json
+++ b/tools/PipelineResultTemplate.json
@@ -1,42 +1,42 @@
 {
     "build": {
-        "Name": "Build",
+        "PhaseName": "Build",
         "Order": 1,
         "Details": [
         ]
     },
     "breaking-change": {
-        "Name": "Breaking Change Check",
+        "PhaseName": "Breaking Change Check",
         "Order": 2,
         "Details": [
         ]
     },
     "signature": {
-        "Name": "Signature Check",
+        "PhaseName": "Signature Check",
         "Order": 3,
         "Details": [
         ]
     },
     "help-example": {
-        "Name": "Help Example Check",
+        "PhaseName": "Help Example Check",
         "Order": 4,
         "Details": [
         ]
     },
     "help": {
-        "Name": "Help File Existence Check",
+        "PhaseName": "Help File Existence Check",
         "Order": 5,
         "Details": [
         ]
     },
     "file-change": {
-        "Name": "File Change Check",
+        "PhaseName": "File Change Check",
         "Order": 6,
         "Details": [
         ]
     },
     "test": {
-        "Name": "Test",
+        "PhaseName": "Test",
         "Order": 100,
         "Details": [
         ]
diff --git a/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1 b/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1
index c1f3ef99329a..45a183747e6a 100644
--- a/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1
+++ b/tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1
@@ -51,32 +51,32 @@ ForEach ($Step In $DependencyStepList)
 
 $Steps = @(
     @{
-        StepName = "breaking-change"
+        PhaseName = "breaking-change"
         IssuePath = "$StaticAnalysisOutputDirectory/BreakingChangeIssues.csv"
     },
     @{
-        StepName = "help"
+        PhaseName = "help"
         IssuePath = "$StaticAnalysisOutputDirectory/HelpIssues.csv"
     },
     @{
-        StepName = "help-example"
+        PhaseName = "help-example"
         IssuePath = "$StaticAnalysisOutputDirectory/ExampleIssues.csv"
     },
     @{
-        StepName = "signature"
+        PhaseName = "signature"
         IssuePath = "$StaticAnalysisOutputDirectory/SignatureIssues.csv"
     },
     @{
-        StepName = "file-change"
+        PhaseName = "file-change"
         IssuePath = "$StaticAnalysisOutputDirectory/FileChangeIssue.csv"
     }
 )
 
 ForEach ($Step In $Steps)
 {
-    $StepName = $Step.StepName
+    $PhaseName = $Step.PhaseName
     $IssuePath = $Step.IssuePath
-    $Details = $Template.$StepName.Details
+    $Details = $Template.$PhaseName.Details
     If ($Details.Length -Ne 0)
     {
         $Details = $Details[0]
@@ -115,11 +115,11 @@ ForEach ($Step In $Steps)
             {
                 #Region generate table head of each step
                 $NormalSteps = [System.Collections.Generic.HashSet[String]]@("breaking-change", "help", "signature", "file-change")
-                If ($NormalSteps.Contains($StepName))
+                If ($NormalSteps.Contains($PhaseName))
                 {
                     $Content = "|Type|Cmdlet|Description|Remediation|`n|---|---|---|---|`n"
                 }
-                ElseIf ($StepName -Eq "help-example")
+                ElseIf ($PhaseName -Eq "help-example")
                 {
                     $Content = "|Type|Cmdlet|Example|Line|RuleName|Description|Extent|Remediation|`n|---|---|---|---|---|---|---|---|`n"
                 }
@@ -136,11 +136,11 @@ ForEach ($Step In $Steps)
                         $ErrorTypeEmoji = "⚠️"
                     }
                     #Region generate table content of each step
-                    If ($NormalSteps.Contains($StepName))
+                    If ($NormalSteps.Contains($PhaseName))
                     {
                         $Content += "|$ErrorTypeEmoji|$($Issue.Target)|$($Issue.Description)|$($Issue.Remediation)|`n"
                     }
-                    ElseIf ($StepName -Eq "help-example")
+                    ElseIf ($PhaseName -Eq "help-example")
                     {
                         $Content += "|$ErrorTypeEmoji|$($Issue.Target)|$($Issue.Example)|$($Issue.Line)|$($Issue.RuleName)|$($Issue.Description)|$($Issue.Extent)|$($Issue.Remediation)|`n"
                     }