diff --git a/RedLock.StrongName.nuspec b/RedLock.StrongName.nuspec
index f85da47..897c9d0 100644
--- a/RedLock.StrongName.nuspec
+++ b/RedLock.StrongName.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>RedLock.net.StrongName</id>
-		<version>2.0.0-pre3</version>
+		<version>2.0.0</version>
 		<title>RedLock.net (Strong Named)</title>
 		<authors>Sam Cook</authors>
 		<owners>Sam Cook</owners>
@@ -11,8 +11,8 @@
 		<iconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>An implementation of the Redlock distributed lock algorithm</description>
-		<releaseNotes>2.0.0-pre3 - .NET Core release</releaseNotes>
-		<copyright>Copyright 2017 Sam Cook</copyright>
+		<releaseNotes>2.0.0 - .NET Core release</releaseNotes>
+		<copyright>Copyright 2018 Sam Cook</copyright>
 		<tags>RedLock Redis Distributed Lock</tags>
 		<dependencies>
 			<group targetFramework=".NETStandard1.5">
diff --git a/RedLock.nuspec b/RedLock.nuspec
index 249932a..31733e8 100644
--- a/RedLock.nuspec
+++ b/RedLock.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>RedLock.net</id>
-		<version>2.0.0-pre3</version>
+		<version>2.0.0</version>
 		<title>RedLock.net</title>
 		<authors>Sam Cook</authors>
 		<owners>Sam Cook</owners>
@@ -11,8 +11,8 @@
 		<iconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>An implementation of the Redlock distributed lock algorithm</description>
-		<releaseNotes>2.0.0-pre3 - .NET Core release</releaseNotes>
-		<copyright>Copyright 2017 Sam Cook</copyright>
+		<releaseNotes>2.0.0 - .NET Core release</releaseNotes>
+		<copyright>Copyright 2018 Sam Cook</copyright>
 		<tags>RedLock Redis Distributed Lock</tags>
 		<dependencies>
 			<group targetFramework=".NETStandard1.5">
diff --git a/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj b/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj
index c874317..b85e185 100644
--- a/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj
+++ b/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj
@@ -4,20 +4,20 @@
     <TargetFramework>netstandard1.1</TargetFramework>
     <RootNamespace>RedLockNet</RootNamespace>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Version>2.0.0-pre3</Version>
+    <Version>2.0.0</Version>
     <Authors>Sam Cook</Authors>
     <Company />
     <Product>RedLock.net</Product>
     <Description>Abstractions for the RedLock.net package</Description>
     <PackageId>RedLock.net.Abstractions</PackageId>
-    <Copyright>Copyright 2017 Sam Cook</Copyright>
+    <Copyright>Copyright 2018 Sam Cook</Copyright>
     <PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/samcook/RedLock.net</RepositoryUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>RedLock Redis Distributed Lock</PackageTags>
-    <PackageReleaseNotes>2.0.0-pre3 - .NET Core release</PackageReleaseNotes>
+    <PackageReleaseNotes>2.0.0 - .NET Core release</PackageReleaseNotes>
     <AssemblyName>RedLockNet.Abstractions.StrongName</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\RedLock.StrongName.snk</AssemblyOriginatorKeyFile>
diff --git a/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj b/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj
index bc55686..405fbf2 100644
--- a/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj
+++ b/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj
@@ -4,20 +4,20 @@
     <TargetFramework>netstandard1.1</TargetFramework>
     <RootNamespace>RedLockNet</RootNamespace>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Version>2.0.0-pre3</Version>
+    <Version>2.0.0</Version>
     <Authors>Sam Cook</Authors>
     <Company />
     <Product>RedLock.net</Product>
     <Description>Abstractions for the RedLock.net package</Description>
     <PackageId>RedLock.net.Abstractions</PackageId>
-    <Copyright>Copyright 2017 Sam Cook</Copyright>
+    <Copyright>Copyright 2018 Sam Cook</Copyright>
     <PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/samcook/RedLock.net</RepositoryUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>RedLock Redis Distributed Lock</PackageTags>
-    <PackageReleaseNotes>2.0.0-pre3 - .NET Core release</PackageReleaseNotes>
+    <PackageReleaseNotes>2.0.0 - .NET Core release</PackageReleaseNotes>
     <AssemblyName>RedLockNet.Abstractions</AssemblyName>
   </PropertyGroup>
 
diff --git a/RedLockNet.SERedis.Shared/RedLock.cs b/RedLockNet.SERedis.Shared/RedLock.cs
index 8da7896..3fe1d81 100644
--- a/RedLockNet.SERedis.Shared/RedLock.cs
+++ b/RedLockNet.SERedis.Shared/RedLock.cs
@@ -206,11 +206,11 @@ private async Task StartAsync()
 				var iteration = i + 1;
 				logger.LogDebug($"Lock attempt {iteration}/{quorumRetryCount}: {Resource} ({LockId}), expiry: {expiryTime}");
 
-				var startTick = Stopwatch.GetTimestamp();
+				var stopwatch = Stopwatch.StartNew();
 
 				lockSummary = Lock();
 
-				var validityTicks = GetRemainingValidityTicks(startTick);
+				var validityTicks = GetRemainingValidityTicks(stopwatch);
 
 				logger.LogDebug($"Acquired locks for {Resource} ({LockId}) in {lockSummary.Acquired}/{redisCaches.Count} instances, quorum: {quorum}, validityTicks: {validityTicks}");
 
@@ -252,11 +252,11 @@ private async Task StartAsync()
 				var iteration = i + 1;
 				logger.LogDebug($"Lock attempt {iteration}/{quorumRetryCount}: {Resource} ({LockId}), expiry: {expiryTime}");
 
-				var startTick = Stopwatch.GetTimestamp();
+				var stopwatch = Stopwatch.StartNew();
 
 				lockSummary = await LockAsync().ConfigureAwait(false);
 
-				var validityTicks = GetRemainingValidityTicks(startTick);
+				var validityTicks = GetRemainingValidityTicks(stopwatch);
 
 				logger.LogDebug($"Acquired locks for {Resource} ({LockId}) in {lockSummary.Acquired}/{redisCaches.Count} instances, quorum: {quorum}, validityTicks: {validityTicks}");
 
@@ -300,11 +300,11 @@ private void StartAutoExtendTimer()
 					{
 						logger.LogTrace($"Lock renewal timer fired: {Resource} ({LockId})");
 
-						var startTick = Stopwatch.GetTimestamp();
+						var stopwatch = Stopwatch.StartNew();
 
 						var extendSummary = Extend();
 
-						var validityTicks = GetRemainingValidityTicks(startTick);
+						var validityTicks = GetRemainingValidityTicks(stopwatch);
 
 						if (extendSummary.Acquired >= quorum && validityTicks > 0)
 						{
@@ -334,12 +334,12 @@ private void StartAutoExtendTimer()
 				(int) interval);
 		}
 
-		private long GetRemainingValidityTicks(long startTick)
+		private long GetRemainingValidityTicks(Stopwatch sw)
 		{
 			// Add 2 milliseconds to the drift to account for Redis expires precision,
 			// which is 1 milliescond, plus 1 millisecond min drift for small TTLs.
 			var driftTicks = (long) (expiryTime.Ticks * clockDriftFactor) + TimeSpan.FromMilliseconds(2).Ticks;
-			var validityTicks = expiryTime.Ticks - (Stopwatch.GetTimestamp() - startTick) - driftTicks;
+			var validityTicks = expiryTime.Ticks - sw.Elapsed.Ticks - driftTicks;
 			return validityTicks;
 		}
 
diff --git a/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj b/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj
index 15778e4..2d86d55 100644
--- a/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj
+++ b/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj
@@ -5,19 +5,19 @@
     <AssemblyName>RedLockNet.SERedis.StrongName</AssemblyName>
     <PackageId>RedLock.net</PackageId>
     <RootNamespace>RedLockNet.SERedis</RootNamespace>
-    <Version>2.0.0-pre3</Version>
+    <Version>2.0.0</Version>
     <Description>An implementation of the Redlock distributed lock algorithm</Description>
     <Authors>Sam Cook</Authors>
     <Company />
     <Product>RedLock.net</Product>
-    <Copyright>Copyright 2017 Sam Cook</Copyright>
+    <Copyright>Copyright 2018 Sam Cook</Copyright>
     <PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/samcook/RedLock.net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>RedLock Redis Distributed Lock</PackageTags>
-    <PackageReleaseNotes>2.0.0-pre3 - .NET Core release</PackageReleaseNotes>
+    <PackageReleaseNotes>2.0.0 - .NET Core release</PackageReleaseNotes>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 	  <SignAssembly>True</SignAssembly>
 	  <AssemblyOriginatorKeyFile>..\RedLock.StrongName.snk</AssemblyOriginatorKeyFile>
diff --git a/RedLockNet.SERedis/RedLockNet.SERedis.csproj b/RedLockNet.SERedis/RedLockNet.SERedis.csproj
index 081bce7..ab07cdc 100644
--- a/RedLockNet.SERedis/RedLockNet.SERedis.csproj
+++ b/RedLockNet.SERedis/RedLockNet.SERedis.csproj
@@ -5,19 +5,19 @@
     <AssemblyName>RedLockNet.SERedis</AssemblyName>
     <PackageId>RedLock.net</PackageId>
     <RootNamespace>RedLockNet.SERedis</RootNamespace>
-    <Version>2.0.0-pre3</Version>
+    <Version>2.0.0</Version>
     <Description>An implementation of the Redlock distributed lock algorithm</Description>
     <Authors>Sam Cook</Authors>
     <Company />
     <Product>RedLock.net</Product>
-    <Copyright>Copyright 2017 Sam Cook</Copyright>
+    <Copyright>Copyright 2018 Sam Cook</Copyright>
     <PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/samcook/RedLock.net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>RedLock Redis Distributed Lock</PackageTags>
-    <PackageReleaseNotes>2.0.0-pre3 - .NET Core release</PackageReleaseNotes>
+    <PackageReleaseNotes>2.0.0 - .NET Core release</PackageReleaseNotes>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>