diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1c191f5..ff63913 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 pool:
   vmImage: 'vs2017-win2016'
 
-name: 1.$(Date:yyyy.MM)$(Rev:.r)+$(SourceBranchName)
+name: $(SourceBranchName)+1.$(Date:yyyy.MM)$(Rev:.r)
 
 steps:
 - script: echo Starting build pipeline!
@@ -9,7 +9,7 @@ steps:
 
 - powershell: |
     echo "##vso[task.setvariable variable=configuration;isOutput=true]$(IF($env:BRANCH -eq "refs/heads/master"){"Azure Pipelines"}else{"release"})"
-    echo "##vso[task.setvariable variable=BuildNumber;isOutput=true]$(($env:BuildNumber).Substring(0,($env:BuildNumber).IndexOf('+')))"
+    echo "##vso[task.setvariable variable=BuildNumber;isOutput=true]$(($env:BuildNumber).Substring(($env:BuildNumber).LastIndexOf('+')+1))"
   name: MyVars
   env: 
     BRANCH: $(Build.SourceBranch)