diff --git a/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj b/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj
index 799b6dd..8c60f27 100644
--- a/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj
+++ b/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj
@@ -4,25 +4,23 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Authors>Mihir Dilip</Authors>
     <Company>Mihir Dilip</Company>
-    <Description>This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.
-
-Easy to use and very light weight Microsoft style Basic Scheme Authentication Implementation for ASP.NET Core.</Description>
-    <RepositoryUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic</RepositoryUrl>
+    <Description>Easy to use and very light weight Microsoft style Basic Scheme Authentication Implementation for ASP.NET Core.</Description>
+    <RepositoryUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic/tree/2.2.0</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageProjectUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic</PackageProjectUrl>
-    <Version>2.0.1</Version>
+    <PackageProjectUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic/tree/2.2.0</PackageProjectUrl>
+    <Version>2.2.0</Version>
     <Copyright>Copyright (c) 2019 Mihir Dilip</Copyright>
     <PackageLicenseUrl></PackageLicenseUrl>
 	<RepositoryType>GitHub</RepositoryType>
     <PackageIconUrl />
-    <PackageTags>asp-net-core, aspnetcore, netstandard, netstandard20, basic-authentication, basicauthentication, dotnetcore, asp-net-core-basic-authentication, aspnetcore-basic-authentication, security, authentication, asp-net-core-authentication, aspnetcore-authentication</PackageTags>
+    <PackageTags>aspnetcore, security, authentication, microsoft, microsoft.aspnetcore.authentication, microsoft-aspnetcore-authentication, microsoft.aspnetcore.authentication.basic, microsoft-aspnetcore-authentication-basic, asp-net-core, netstandard, netstandard20, basic-authentication, basicauthentication, dotnetcore, asp-net-core-basic-authentication, aspnetcore-basic-authentication, asp-net-core-authentication, aspnetcore-authentication, asp, aspnet, basic, authentication-scheme</PackageTags>
     <NeutralLanguage />
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.</PackageReleaseNotes>
+    <PackageReleaseNotes></PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <RootNamespace>Mihir.AspNetCore.Authentication.Basic</RootNamespace>
-    <PackageId>Mihir.AspNetCore.Authentication.Basic</PackageId>
-    <Product>Mihir.AspNetCore.Authentication.Basic</Product>
+    <RootNamespace>AspNetCore.Authentication.Basic</RootNamespace>
+    <PackageId>AspNetCore.Authentication.Basic</PackageId>
+    <Product>AspNetCore.Authentication.Basic</Product>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/AspNetCore.Authentication.Basic/BasicDefaults.cs b/src/AspNetCore.Authentication.Basic/BasicDefaults.cs
index aa584f6..05f9b30 100644
--- a/src/AspNetCore.Authentication.Basic/BasicDefaults.cs
+++ b/src/AspNetCore.Authentication.Basic/BasicDefaults.cs
@@ -1,14 +1,11 @@
 // Copyright (c) Mihir Dilip. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
-
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// Default values used by basic authentication.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	public static class BasicDefaults
 	{
 		/// <summary>
diff --git a/src/AspNetCore.Authentication.Basic/BasicExtensions.cs b/src/AspNetCore.Authentication.Basic/BasicExtensions.cs
index 57704a4..a4ee396 100644
--- a/src/AspNetCore.Authentication.Basic/BasicExtensions.cs
+++ b/src/AspNetCore.Authentication.Basic/BasicExtensions.cs
@@ -6,12 +6,11 @@
 using Microsoft.Extensions.Options;
 using System;
 
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// Extension methods for basic authentication.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	public static class BasicExtensions
 	{
 		/// <summary>
diff --git a/src/AspNetCore.Authentication.Basic/BasicHandler.cs b/src/AspNetCore.Authentication.Basic/BasicHandler.cs
index 59dbe8b..a73eb5f 100644
--- a/src/AspNetCore.Authentication.Basic/BasicHandler.cs
+++ b/src/AspNetCore.Authentication.Basic/BasicHandler.cs
@@ -12,12 +12,11 @@
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// Inherited from <see cref="AuthenticationHandler{TOptions}"/> for basic authentication.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	public class BasicHandler : AuthenticationHandler<BasicOptions>
 	{
 		private readonly IBasicUserValidationService _basicUserValidationService;
diff --git a/src/AspNetCore.Authentication.Basic/BasicOptions.cs b/src/AspNetCore.Authentication.Basic/BasicOptions.cs
index 05e86c3..67470a6 100644
--- a/src/AspNetCore.Authentication.Basic/BasicOptions.cs
+++ b/src/AspNetCore.Authentication.Basic/BasicOptions.cs
@@ -2,14 +2,12 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Authentication;
-using System;
 
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// Inherited from <see cref="AuthenticationSchemeOptions"/> to allow extra option properties for 'Basic' authentication.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	public class BasicOptions : AuthenticationSchemeOptions
 	{
 		/// <summary>
diff --git a/src/AspNetCore.Authentication.Basic/BasicPostConfigureOptions.cs b/src/AspNetCore.Authentication.Basic/BasicPostConfigureOptions.cs
index ddbe78b..6cecbc0 100644
--- a/src/AspNetCore.Authentication.Basic/BasicPostConfigureOptions.cs
+++ b/src/AspNetCore.Authentication.Basic/BasicPostConfigureOptions.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Mihir Dilip. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.Extensions.Options;
+using System;
 
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// This post configure options checks whether the required option property <see cref="BasicOptions.Realm" /> is set or not on <see cref="BasicOptions"/>.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	class BasicPostConfigureOptions : IPostConfigureOptions<BasicOptions>
 	{
 		public void PostConfigure(string name, BasicOptions options)
diff --git a/src/AspNetCore.Authentication.Basic/IBasicUserValidationService.cs b/src/AspNetCore.Authentication.Basic/IBasicUserValidationService.cs
index 1f60f7f..09df8c4 100644
--- a/src/AspNetCore.Authentication.Basic/IBasicUserValidationService.cs
+++ b/src/AspNetCore.Authentication.Basic/IBasicUserValidationService.cs
@@ -1,15 +1,13 @@
 // Copyright (c) Mihir Dilip. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
 using System.Threading.Tasks;
 
-namespace Mihir.AspNetCore.Authentication.Basic
+namespace AspNetCore.Authentication.Basic
 {
 	/// <summary>
 	/// Implementation of this interface will be used by the 'Basic' authentication handler to validated the username and password.
 	/// </summary>
-	[Obsolete("This NuGet package has been made obsolete and moved to a new package named 'AspNetCore.Authentication.Basic'. Please consider removing this package and download the new one as there will be no future updates on this package. Sorry for the inconvenience caused. This was done purely for the naming of the package. New package name is 'AspNetCore.Authentication.Basic' which can be downloaded using NuGet Package Manager or from https://www.nuget.org/packages/AspNetCore.Authentication.Basic.")]
 	public interface IBasicUserValidationService
 	{
 		/// <summary>