diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 868396e9842..5320d885ef3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -171,13 +171,13 @@ jobs:
         include:
           - os: windows
             platform: windows
-            shell: cmd
+            shelltype: cmd
           - os: macos
             platform: macos
-            shell: bash
+            shelltype: bash
           - os: ubuntu-latest
             platform: linux
-            shell: bash
+            shelltype: bash
             filter: --where="Category != Audio"
           # - os: linux
           #   platform: linux
@@ -246,7 +246,7 @@ jobs:
           CI: true
 
       - name: Run DirectX Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll
         env:
           CI: true
@@ -256,14 +256,14 @@ jobs:
       # Run the DesktopGL tests on all platforms using NUnitLite runner not dotnet test
       # We have to run this is bits because the tests crash if too many are run in one go?
       - name: Run Framework Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Framework ${{matrix.filter}}
         env:
           CI: true
         working-directory: tests-desktopgl
 
       - name: Run Audio Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Audio
         env:
           CI: true
@@ -271,28 +271,28 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Input Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Input
         env:
           CI: true
         working-directory: tests-desktopgl
 
       - name: Run Visual Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Visual
         env:
           CI: true
         working-directory: tests-desktopgl
 
       - name: Run Game Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --where="Category = GameTest"
         env:
           CI: true
         working-directory: tests-desktopgl
 
       - name: Run Graphics.BlendStateTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.BlendStateTest
         env:
           CI: true
@@ -300,7 +300,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.DepthStencilStateTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.DepthStencilStateTest
         env:
           CI: true
@@ -308,7 +308,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.EffectTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.EffectTest
         env:
           CI: true
@@ -316,7 +316,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.GraphicsAdapterTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.GraphicsAdapterTest
         env:
           CI: true
@@ -332,7 +332,7 @@ jobs:
       #   if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.IndexBufferTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.IndexBufferTest
         env:
           CI: true
@@ -340,7 +340,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.MiscellaneousTests Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.MiscellaneousTests
         env:
           CI: true
@@ -348,7 +348,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.ModelTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.ModelTest
         env:
           CI: true
@@ -356,7 +356,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.OcclusionQueryTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.OcclusionQueryTest
         env:
           CI: true
@@ -364,7 +364,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.RasterizerStateTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.RasterizerStateTest
         env:
           CI: true
@@ -372,7 +372,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.RenderTarget2DTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.RenderTarget2DTest
         env:
           CI: true
@@ -380,7 +380,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.RenderTargetCubeTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.RenderTargetCubeTest
         env:
           CI: true
@@ -388,7 +388,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.SamplerStateTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.SamplerStateTest
         env:
           CI: true
@@ -396,7 +396,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.ScissorRectangleTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.ScissorRectangleTest
         env:
           CI: true
@@ -404,7 +404,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.ShaderTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.ShaderTest
         env:
           CI: true
@@ -412,7 +412,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.SpriteBatchTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.SpriteBatchTest
         env:
           CI: true
@@ -420,7 +420,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.SpriteFontTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.SpriteFontTest
         env:
           CI: true
@@ -428,7 +428,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.Texture2DNonVisualTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.Texture2DNonVisualTest
         env:
           CI: true
@@ -436,7 +436,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.Texture2DTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.Texture2DTest
         env:
           CI: true
@@ -444,7 +444,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.Texture3DNonVisualTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.Texture3DNonVisualTest
         env:
           CI: true
@@ -452,7 +452,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.Texture3DTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.Texture3DTest
         env:
           CI: true
@@ -460,7 +460,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.TextureCubeTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.TextureCubeTest
         env:
           CI: true
@@ -468,7 +468,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.VertexBufferTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.VertexBufferTest
         env:
           CI: true
@@ -476,7 +476,7 @@ jobs:
         if: runner.environment != 'github-hosted'
 
       - name: Run Graphics.ViewportTest Tests
-        shell: ${{matrix.shell}}
+        shell: ${{matrix.shelltype}}
         run: dotnet MonoGame.Tests.dll --timeout=300000 --test MonoGame.Tests.Graphics.ViewportTest
         env:
           CI: true