diff --git a/Directory.Build.props b/Directory.Build.props
index b47a60670..a15044b52 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -65,17 +65,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Tokens Include="Box_ClientId">
-      <ReplacementValue>$(Box_ClientId)</ReplacementValue>
+    <Tokens Include="Box13_ClientId">
+      <ReplacementValue>$(Box13_ClientId)</ReplacementValue>
     </Tokens>
-    <Tokens Include="Box_ClientSecret">
-      <ReplacementValue>$(Box_ClientSecret)</ReplacementValue>
+    <Tokens Include="Box13_ClientSecret">
+      <ReplacementValue>$(Box13_ClientSecret)</ReplacementValue>
     </Tokens>
-    <Tokens Include="DropBox_ClientId">
-      <ReplacementValue>$(DropBox_ClientId)</ReplacementValue>
+    <Tokens Include="DropBox13_ClientId">
+      <ReplacementValue>$(DropBox13_ClientId)</ReplacementValue>
     </Tokens>
-    <Tokens Include="DropBox_ClientSecret">
-      <ReplacementValue>$(DropBox_ClientSecret)</ReplacementValue>
+    <Tokens Include="DropBox13_ClientSecret">
+      <ReplacementValue>$(DropBox13_ClientSecret)</ReplacementValue>
     </Tokens>
     <Tokens Include="Flickr_ClientId">
       <ReplacementValue>$(Flickr_ClientId)</ReplacementValue>
diff --git a/GreenshotBoxPlugin/GreenshotBoxPlugin.Credentials.template b/GreenshotBoxPlugin/GreenshotBoxPlugin.Credentials.template
index 9ad35eced..72cfa4b79 100644
--- a/GreenshotBoxPlugin/GreenshotBoxPlugin.Credentials.template
+++ b/GreenshotBoxPlugin/GreenshotBoxPlugin.Credentials.template
@@ -25,7 +25,7 @@ namespace GreenshotBoxPlugin {
 	/// You can set your own values here
 	/// </summary>
 	public static class BoxCredentials {
-		public static string ClientId = "${Box_ClientId}";
-		public static string ClientSecret = "${Box_ClientSecret}";
+		public static string ClientId = "${Box13_ClientId}";
+		public static string ClientSecret = "${Box13_ClientSecret}";
 	}
 }
diff --git a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.Credentials.template b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.Credentials.template
index 6a13eb6d7..f674f1bb7 100644
--- a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.Credentials.template
+++ b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.Credentials.template
@@ -25,7 +25,7 @@ namespace GreenshotDropboxPlugin {
 	/// You can set your own values here
 	/// </summary>
 	public static class DropBoxCredentials {
-		public static string CONSUMER_KEY = "${DropBox_ClientId}";
-		public static string CONSUMER_SECRET = "${DropBox_ClientSecret}";
+		public static string CONSUMER_KEY = "${DropBox13_ClientId}";
+		public static string CONSUMER_SECRET = "${DropBox13_ClientSecret}";
 	}
 }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a361c6282..369e584cb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,10 +43,10 @@ stages:
         platform: $(buildPlatform)
         configuration: $(buildConfiguration)
       env:
-        Box_ClientId: $(Box_ClientId)
-        Box_ClientSecret: $(Box_ClientSecret)
-        DropBox_ClientId: $(DropBox_ClientId)
-        DropBox_ClientSecret: $(DropBox_ClientSecret)
+        Box13_ClientId: $(Box13_ClientId)
+        Box13_ClientSecret: $(Box13_ClientSecret)
+        DropBox13_ClientId: $(DropBox13_ClientId)
+        DropBox13_ClientSecret: $(DropBox13_ClientSecret)
         Flickr_ClientId: $(Flickr_ClientId)
         Flickr_ClientSecret: $(Flickr_ClientSecret)
         Imgur13_ClientId: $(Imgur13_ClientId)