diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4ce0c2a..321bd1a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -21,7 +21,7 @@ env:
   MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
   MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
   OPERATING_SYSTEM: ubuntu-latest
-  CSHARP_VERSION: 7.0.x
+  DOTNET_VERSION: 7.0.x
 
 jobs:
   deploy_pre_release:
@@ -54,7 +54,7 @@ jobs:
         with:
           dotnet-version: '7.0.x'
 
-      - name: Run integration tests
+      - name: Run functional tests
         run: dotnet test $BW_PROJECT_TEST_NAME
         
       - name: Pack NuGet package
@@ -102,7 +102,7 @@ jobs:
         with:
           dotnet-version: '7.0.x'
 
-      - name: Run integration tests
+      - name: Run functional tests
         run: dotnet test $BW_PROJECT_TEST_NAME
         
       - name: Pack NuGet package
diff --git a/.github/workflows/test-nightly.yml b/.github/workflows/test-nightly.yml
index 6d5260c..34e625e 100644
--- a/.github/workflows/test-nightly.yml
+++ b/.github/workflows/test-nightly.yml
@@ -41,9 +41,7 @@ jobs:
       - name: Run functional tests
         env:
           OPERATING_SYSTEM: ${{ matrix.os }}
-          CSHARP_VERSION: ${{ matrix.dotnet }}
-          # Required for multiple target frameworks in the StandardTests project.
-          DOTNET: ${{ matrix.dotnet }}
+          DOTNET_VERSION: ${{ matrix.dotnet }}
         run: dotnet test src/Bandwidth.Standard.Test
 
   test_feature:
@@ -67,9 +65,7 @@ jobs:
       - name: Run functional tests
         env:
           OPERATING_SYSTEM: ${{ matrix.os }}
-          CSHARP_VERSION: ${{ matrix.dotnet }}
-          # Required for multiple target frameworks in the StandardTests project.
-          DOTNET: ${{ matrix.dotnet }}
+          DOTNET_VERSION: ${{ matrix.dotnet }}
         run: dotnet test src/Bandwidth.Standard.Test
 
   notify_for_failures:
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index 764c1df..c14691e 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -39,7 +39,5 @@ jobs:
       - name: Run functional tests
         env:
           OPERATING_SYSTEM: ${{ matrix.os }}
-          CSHARP_VERSION: ${{ matrix.dotnet }}
-          # Required for multiple target frameworks in the StandardTests project.
-          DOTNET: ${{ matrix.dotnet }}
+          DOTNET_VERSION: ${{ matrix.dotnet }}
         run: dotnet test src/Bandwidth.Standard.Test
diff --git a/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj b/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj
index a4af930..78023e6 100644
--- a/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj
+++ b/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <AssemblyName>Bandwidth.Standard.Test</AssemblyName>
     <RootNamespace>Bandwidth.Standard.Test</RootNamespace>
-    <TargetFramework Condition="'$(DOTNET)' == '6.0.x' Or '$(DOTNET)' == ''">net6.0</TargetFramework>
-    <TargetFramework Condition="'$(DOTNET)' == '7.0.x'">net7.0</TargetFramework>
+    <TargetFramework Condition="'$(DOTNET_VERSION)' == '6.0.x' Or '$(DOTNET_VERSION)' == ''">net6.0</TargetFramework>
+    <TargetFramework Condition="'$(DOTNET_VERSION)' == '7.0.x'">net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs b/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs
index 88e08b4..931c823 100644
--- a/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs
+++ b/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs
@@ -99,7 +99,7 @@ public Tuple<string, string> CreateConferenceTest()
             var jsonBody = JsonSerializer.Serialize(new
             {
                 os = Environment.GetEnvironmentVariable("OPERATING_SYSTEM"),
-                language = "csharp" + Environment.GetEnvironmentVariable("CSHARP_VERSION"),
+                language = "csharp" + Environment.GetEnvironmentVariable("DOTNET_VERSION"),
                 type = "CONFERENCE"
             });
             var options = new RequestOptions
diff --git a/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs b/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs
index c3bde7f..2dc89e4 100644
--- a/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs
+++ b/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs
@@ -109,7 +109,7 @@ public Tuple<string, string> CreateAndValidateCall()
             var jsonBody = JsonSerializer.Serialize(new
             {
                 os = Environment.GetEnvironmentVariable("OPERATING_SYSTEM"),
-                language = "csharp" + Environment.GetEnvironmentVariable("CSHARP_VERSION"),
+                language = "csharp" + Environment.GetEnvironmentVariable("DOTNET_VERSION"),
                 type = "CALL"
             });
             var options = new RequestOptions