diff --git a/build.ps1 b/build.ps1
index b39b817cf..437d1ab18 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,10 +1,4 @@
-if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
-    $build = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
-} else {
-    $build = "dev"
-}
-
-appveyor-retry dotnet restore Discord.Net.sln -v Minimal -p:BuildNumber="$build"
+appveyor-retry dotnet restore Discord.Net.sln -v Minimal -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet build Discord.Net.sln -c "Release" -p:BuildNumber="$build"
+dotnet build Discord.Net.sln -c "Release" -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
diff --git a/init.ps1 b/init.ps1
new file mode 100644
index 000000000..b57464228
--- /dev/null
+++ b/init.ps1
@@ -0,0 +1,5 @@
+if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
+    $env:BUILD = "rc-$($env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
+} else {
+    $env:BUILD = "dev"
+}
\ No newline at end of file
diff --git a/pack.ps1 b/pack.ps1
index 531623a30..e6c593104 100644
--- a/pack.ps1
+++ b/pack.ps1
@@ -1,22 +1,16 @@
-if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
-    $build = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
-} else {
-    $build = "dev"
-}
-
-dotnet pack "src\Discord.Net\Discord.Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net\Discord.Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" -c "Release" -o "../../artifacts" --no-build -p:BuildNumber="$build"
+dotnet pack "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
index 5e7ecda0c..1736bfcdb 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>A Discord.Net extension adding support for bot commands.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Commands</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index 27603b2d7..fe8f3a2a4 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>A .Net API wrapper and bot framework for Discord.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Core</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
index b8a278565..3e3b9a5fe 100644
--- a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
+++ b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.Providers.UDPClient</AssemblyName>
diff --git a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
index 4d73aeaa7..83a3669d9 100644
--- a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
+++ b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index ff1c196dc..618e3b54a 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the REST client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rest</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
index 1f0840d7e..0613cd846 100644
--- a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
+++ b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the RPC client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rpc</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index 266baa010..f14a5b874 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.WebSocket</AssemblyName>
diff --git a/src/Discord.Net/Discord.Net.csproj b/src/Discord.Net/Discord.Net.csproj
index 6645dc956..fd94dab20 100644
--- a/src/Discord.Net/Discord.Net.csproj
+++ b/src/Discord.Net/Discord.Net.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <Description>An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix>dev</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/test.ps1 b/test.ps1
index 98df9469d..34fe4aaa0 100644
--- a/test.ps1
+++ b/test.ps1
@@ -1,8 +1,2 @@
-if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
-    $build = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
-} else {
-    $build = "dev"
-}
-
-dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild -p:BuildNumber="$build"
+dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild -p:VersionSuffix="$env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file