diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index bc102d47af74..c7141670587d 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -9,49 +9,49 @@ parameters:
   BuildDocs: true
   TestMatrix:
     Linux_Python27:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '2.7'
       CoverageArg: ''
       RunForPR: true
     Linux_Python35:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: false
     Linux_Python36:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.6'
       CoverageArg: ''
       RunForPR: false
     Linux_Python37:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.7'
       CoverageArg: ''
       RunForPR: false
     Linux_Python38:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
       CoverageArg: ''
       RunForPR: true
     Windows_Python35:
-      OSName: 'Windows'
+      OSVmName: 'Windows'
       OSVmImage: 'windows-2019'
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: true
     MacOS_Python27:
-      OSName: 'MacOS'
+      OSVmName: 'MacOS'
       OSVmImage: 'macOS-10.15'
       PythonVersion: '2.7'
       CoverageArg: ''
       RunForPR: false
     Linux_pypy3:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
       CoverageArg: '--disablecov'
@@ -128,7 +128,7 @@ jobs:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         TestMarkArgument: ${{ parameters.TestMarkArgument }}
         AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"'
-        OSName: $(OSName)
+        OSVmName: $(OSVmName)
         CoverageArg: $(CoverageArg)
         PythonVersion: $(PythonVersion)
         BuildTargetingString: ${{ parameters.BuildTargetingString }}
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
index eec88889e0a8..02a8943e2cef 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -14,23 +14,23 @@ parameters:
   TestTimeoutInMinutes: 120
   Matrix:
     Linux_Python35:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
     MacOs_Python37:
-      OSName: 'MacOS'
+      OSVmName: 'MacOS'
       OSVmImage: 'macOS-10.15'
       PythonVersion: '3.7'
     Windows_Python27:
-      OSName: 'Windows'
+      OSVmName: 'Windows'
       OSVmImage: 'windows-2019'
       PythonVersion: '2.7'
     Linux_PyPy3:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
     Linux_Python38:
-      OSName: 'Linux'
+      OSVmName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
 
@@ -78,7 +78,7 @@ jobs:
           BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
           AfterTestSteps: ${{ parameters.AfterTestSteps }}
           PythonVersion: $(PythonVersion)
-          OSName: $(OSName)
+          OSVmName: $(OSVmName)
           ToxTestEnv: "whl"
           AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
           TestMarkArgument: ${{ parameters.TestMarkArgument }}
diff --git a/eng/pipelines/templates/jobs/tests-nightly-python.yml b/eng/pipelines/templates/jobs/tests-nightly-python.yml
index da66f52abb70..191fefce6bb5 100644
--- a/eng/pipelines/templates/jobs/tests-nightly-python.yml
+++ b/eng/pipelines/templates/jobs/tests-nightly-python.yml
@@ -46,5 +46,5 @@ jobs:
         condition: always()
         inputs:
           testResultsFiles: '**/junit/test-results.xml'
-          testRunTitle: '$(OSName) Python $(PythonVersion)'
+          testRunTitle: '$(OSVmName) Python $(PythonVersion)'
           failTaskOnFailedTests: true
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
index 6a49134d95ea..0c78d740fcdf 100644
--- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml
+++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -21,11 +21,11 @@ stages:
           matrix:
             Windows_Python35:
               OSVmImage: 'windows-2019'
-              OSName: Windows
+              OSVmName: Windows
               PythonVersion: '3.5'
             Windows_Python27:
               OSVmImage: 'windows-2019'
-              OSName: Windows
+              OSVmName: Windows
               PythonVersion: '2.7'
         pool:
           vmImage: $(OSVmImage)
@@ -43,7 +43,7 @@ stages:
                 ACCOUNT_HOST: https://localhost:8081/
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
               PythonVersion: $(PythonVersion)
-              OSName: $(OSName)
+              OSVmName: $(OSVmName)
               ToxTestEnv: 'whl,sdist'
               BuildDocs: ${{parameters.BuildDocs}}
               InjectedPackages: ${{parameters.InjectedPackages}}
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
index 3cb09cfb3c8e..64a7b57dfb90 100644
--- a/eng/pipelines/templates/steps/build-test.yml
+++ b/eng/pipelines/templates/steps/build-test.yml
@@ -4,7 +4,7 @@ parameters:
   EnvVars: {}
   ServiceDirectory: ''
   PythonVersion: ''
-  OSName: ''
+  OSVmName: ''
   BeforeTestSteps: []
   AfterTestSteps: []
   CoverageArg: ''
@@ -25,7 +25,7 @@ steps:
 
   - template: eng/pipelines/templates/scripts/verify-agent-os.yml@azure-sdk-tools
     parameters:
-      OSName: ${{ parameters.OSName }}
+      OSName: ${{ parameters.OSVmName }}
 
   - script: |
       python -m pip install pip == 20.1
@@ -56,7 +56,7 @@ steps:
     condition: always()
     inputs:
       testResultsFiles: '**/*test*.xml'
-      testRunTitle: '${{ parameters.OSName }} Python ${{ parameters.PythonVersion }}'
+      testRunTitle: '${{ parameters.OSVmName }} Python ${{ parameters.PythonVersion }}'
       failTaskOnFailedTests: true
 
   - template: publish-coverage.yml
diff --git a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
index 7b777172dce0..2a41134e0e0d 100644
--- a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
+++ b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
@@ -5,4 +5,3 @@
 aiohttp>=3.0; python_version >= '3.5'
 aiodns>=2.0; python_version >= '3.5'
 msrest>=0.6.10
-
diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml
index c05b7dbfdbf7..2655b11d2f14 100644
--- a/sdk/eventhub/tests.yml
+++ b/sdk/eventhub/tests.yml
@@ -14,19 +14,19 @@ jobs:
       ServiceDirectory: eventhub
       Matrix:
         Linux_Python35:
-          OSName: 'Linux'
+          OSVmName: 'Linux'
           OSVmImage: 'ubuntu-18.04'
           PythonVersion: '3.5'
         Linux_Python38:
-          OSName: 'Linux'
+          OSVmName: 'Linux'
           OSVmImage: 'ubuntu-18.04'
           PythonVersion: '3.8'
         Windows_Python27:
-          OSName: 'Windows'
+          OSVmName: 'Windows'
           OSVmImage: 'windows-2019'
           PythonVersion: '2.7'
         MacOs_Python37:
-          OSName: 'MacOS'
+          OSVmName: 'MacOS'
           OSVmImage: 'macOS-10.15'
           PythonVersion: '3.7'
       EnvVars:
diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml
index b9daff0222dd..095e0e7bbc61 100644
--- a/sdk/servicebus/tests.yml
+++ b/sdk/servicebus/tests.yml
@@ -21,18 +21,18 @@ jobs:
         AZURE_TEST_RUN_LIVE: 'true'
       Matrix:
         Linux_Python35:
-          OSName: 'Linux'
+          OSVmName: 'Linux'
           OSVmImage: 'ubuntu-18.04'
           PythonVersion: '3.5'
         MacOs_Python37:
-          OSName: 'MacOS'
+          OSVmName: 'MacOS'
           OSVmImage: 'macOS-10.15'
           PythonVersion: '3.7'
         Windows_Python27:
-          OSName: 'Windows'
+          OSVmName: 'Windows'
           OSVmImage: 'windows-2019'
           PythonVersion: '2.7'
         Linux_Python38:
-          OSName: 'Linux'
+          OSVmName: 'Linux'
           OSVmImage: 'ubuntu-18.04'
           PythonVersion: '3.8'
\ No newline at end of file