diff --git a/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs b/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs
index 39290ec79..38df2d62a 100644
--- a/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs
@@ -1,8 +1,8 @@
-using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Configuration;
 
 namespace Lidarr.Api.V1.Config
 {
-    public class DownloadClientConfigModule : SonarrConfigModule<DownloadClientConfigResource>
+    public class DownloadClientConfigModule : LidarrConfigModule<DownloadClientConfigResource>
     {
         public DownloadClientConfigModule(IConfigService configService)
             : base(configService)
@@ -14,4 +14,4 @@ namespace Lidarr.Api.V1.Config
             return DownloadClientConfigResourceMapper.ToResource(model);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs b/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs
index 6b10b46c9..a58e5546d 100644
--- a/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs
@@ -4,7 +4,7 @@ using Lidarr.Http.Validation;
 
 namespace Lidarr.Api.V1.Config
 {
-    public class IndexerConfigModule : SonarrConfigModule<IndexerConfigResource>
+    public class IndexerConfigModule : LidarrConfigModule<IndexerConfigResource>
     {
 
         public IndexerConfigModule(IConfigService configService)
diff --git a/src/Lidarr.Api.V1/Config/SonarrConfigModule.cs b/src/Lidarr.Api.V1/Config/LidarrConfigModule.cs
similarity index 86%
rename from src/Lidarr.Api.V1/Config/SonarrConfigModule.cs
rename to src/Lidarr.Api.V1/Config/LidarrConfigModule.cs
index 30e572482..220b96198 100644
--- a/src/Lidarr.Api.V1/Config/SonarrConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/LidarrConfigModule.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Reflection;
 using NzbDrone.Core.Configuration;
 using Lidarr.Http;
@@ -6,16 +6,16 @@ using Lidarr.Http.REST;
 
 namespace Lidarr.Api.V1.Config
 {
-    public abstract class SonarrConfigModule<TResource> : LidarrRestModule<TResource> where TResource : RestResource, new()
+    public abstract class LidarrConfigModule<TResource> : LidarrRestModule<TResource> where TResource : RestResource, new()
     {
         private readonly IConfigService _configService;
 
-        protected SonarrConfigModule(IConfigService configService)
+        protected LidarrConfigModule(IConfigService configService)
             : this(new TResource().ResourceName.Replace("config", ""), configService)
         {
         }
 
-        protected SonarrConfigModule(string resource, IConfigService configService) :
+        protected LidarrConfigModule(string resource, IConfigService configService) :
             base("config/" + resource.Trim('/'))
         {
             _configService = configService;
diff --git a/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs b/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs
index d15e65ee8..cb3e24941 100644
--- a/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs
@@ -4,7 +4,7 @@ using NzbDrone.Core.Validation.Paths;
 
 namespace Lidarr.Api.V1.Config
 {
-    public class MediaManagementConfigModule : SonarrConfigModule<MediaManagementConfigResource>
+    public class MediaManagementConfigModule : LidarrConfigModule<MediaManagementConfigResource>
     {
         public MediaManagementConfigModule(IConfigService configService, PathExistsValidator pathExistsValidator)
             : base(configService)
diff --git a/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs b/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs
index a494a70e5..225e2746f 100644
--- a/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs
@@ -6,7 +6,7 @@ using NzbDrone.Core.Validation;
 
 namespace Lidarr.Api.V1.Config
 {
-    public class MetadataProviderConfigModule : SonarrConfigModule<MetadataProviderConfigResource>
+    public class MetadataProviderConfigModule : LidarrConfigModule<MetadataProviderConfigResource>
     {
         public MetadataProviderConfigModule(IConfigService configService)
             : base(configService)
diff --git a/src/Lidarr.Api.V1/Config/UiConfigModule.cs b/src/Lidarr.Api.V1/Config/UiConfigModule.cs
index a34c6ab6b..4e7910974 100644
--- a/src/Lidarr.Api.V1/Config/UiConfigModule.cs
+++ b/src/Lidarr.Api.V1/Config/UiConfigModule.cs
@@ -5,7 +5,7 @@ using Lidarr.Http;
 
 namespace Lidarr.Api.V1.Config
 {
-    public class UiConfigModule : SonarrConfigModule<UiConfigResource>
+    public class UiConfigModule : LidarrConfigModule<UiConfigResource>
     {
         public UiConfigModule(IConfigService configService)
             : base(configService)
diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
index 5d823a543..24a87d3c3 100644
--- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
+++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
@@ -131,7 +131,7 @@
     <Compile Include="Config\NamingConfigModule.cs" />
     <Compile Include="Config\NamingConfigResource.cs" />
     <Compile Include="Config\NamingExampleResource.cs" />
-    <Compile Include="Config\SonarrConfigModule.cs" />
+    <Compile Include="Config\LidarrConfigModule.cs" />
     <Compile Include="FileSystem\FileSystemModule.cs" />
     <Compile Include="DiskSpace\DiskSpaceModule.cs" />
     <Compile Include="DiskSpace\DiskSpaceResource.cs" />
diff --git a/src/Lidarr.Api.V1/ProviderResource.cs b/src/Lidarr.Api.V1/ProviderResource.cs
index 1c85260d4..428b3717e 100644
--- a/src/Lidarr.Api.V1/ProviderResource.cs
+++ b/src/Lidarr.Api.V1/ProviderResource.cs
@@ -39,7 +39,7 @@ namespace Lidarr.Api.V1
                 Tags = definition.Tags,
                 Fields = SchemaBuilder.ToSchema(definition.Settings),
 
-                InfoLink = string.Format("https://github.com/Sonarr/Sonarr/wiki/Supported-{0}#{1}",
+                InfoLink = string.Format("https://github.com/Lidarr/Lidarr/wiki/Supported-{0}#{1}",
                     typeof(TProviderResource).Name.Replace("Resource", "s"),
                     definition.Implementation.ToLower())
             };
@@ -67,4 +67,4 @@ namespace Lidarr.Api.V1
             return definition;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
index 7d79dd656..f1ff75c67 100644
--- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -168,14 +168,14 @@ namespace NzbDrone.Common.Test.Http
             }
 
             var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
-                .AddQueryParam("url", $"https://sonarr.tv/")
+                .AddQueryParam("url", $"https://lidarr.audio/")
                 .Build();
             request.AllowAutoRedirect = true;
 
             var response = Subject.Get(request);
 
             response.StatusCode.Should().Be(HttpStatusCode.OK);
-            response.Content.Should().Contain("Sonarr");
+            response.Content.Should().Contain("Lidarr");
 
             ExceptionVerification.ExpectedErrors(0);
         }
diff --git a/src/NzbDrone.Console/ConsoleApp.cs b/src/NzbDrone.Console/ConsoleApp.cs
index 385991765..61b82ccaa 100644
--- a/src/NzbDrone.Console/ConsoleApp.cs
+++ b/src/NzbDrone.Console/ConsoleApp.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Console
             {
                 System.Console.WriteLine("");
                 System.Console.WriteLine("");
-                Logger.Fatal(ex.Message + ". This can happen if another instance of Sonarr is already running another application is using the same port (default: 8989) or the user has insufficient permissions");
+                Logger.Fatal(ex.Message + ". This can happen if another instance of Lidarr is already running another application is using the same port (default: 8989) or the user has insufficient permissions");
                 Exit(ExitCodes.RecoverableFailure);
             }
             catch (Exception ex)
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs
index a3a0226a6..589791099 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
             {
                 // Mono 5.0 still has issues in combination with libmediainfo, so disabling this check for now.
                 //_logger.Debug("Mono version 5.0.0 or higher and legacy TLS provider is selected, recommending user to switch to btls.");
-                //return new HealthCheck(GetType(), HealthCheckResult.Warning, "Sonarr now supports Mono 5.x with btls enabled, consider removing MONO_TLS_PROVIDER=legacy option");
+                //return new HealthCheck(GetType(), HealthCheckResult.Warning, "Lidarr now supports Mono 5.x with btls enabled, consider removing MONO_TLS_PROVIDER=legacy option");
             }
 
             return new HealthCheck(GetType());
diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs
index f6f5f7a4d..0a57952ab 100644
--- a/src/NzbDrone.Host/Router.cs
+++ b/src/NzbDrone.Host/Router.cs
@@ -64,7 +64,7 @@ namespace NzbDrone.Host
                             _serviceProvider.SetPermissions(ServiceProvider.SERVICE_NAME);
 
                             // Start the service and exit.
-                            // Ensures that there isn't an instance of Sonarr already running that the service account cannot stop.
+                            // Ensures that there isn't an instance of Lidarr already running that the service account cannot stop.
                             _processProvider.SpawnNewProcess("sc.exe", $"start {ServiceProvider.SERVICE_NAME}", null, true);
                         }
                         break;