diff --git a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
index be1c43674..36e034946 100644
--- a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
+++ b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
@@ -42,7 +42,7 @@ namespace NzbDrone.Api.RootFolders
 
         private int CreateRootFolder(RootFolderResource rootFolderResource)
         {
-            return GetNewId<RootFolder>(_rootFolderService.Add, rootFolderResource);            
+            return GetNewId<RootFolder>(_rootFolderService.Add, rootFolderResource);
         }
 
         private List<RootFolderResource> GetRootFolders()
diff --git a/src/NzbDrone.Common/Cache/CacheManger.cs b/src/NzbDrone.Common/Cache/CacheManager.cs
similarity index 100%
rename from src/NzbDrone.Common/Cache/CacheManger.cs
rename to src/NzbDrone.Common/Cache/CacheManager.cs
diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj
index b2dd6301f..01cd2da76 100644
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -61,7 +61,7 @@
   <ItemGroup>
     <Compile Include="ArchiveProvider.cs" />
     <Compile Include="Cache\Cached.cs" />
-    <Compile Include="Cache\CacheManger.cs" />
+    <Compile Include="Cache\CacheManager.cs" />
     <Compile Include="Cache\ICached.cs" />
     <Compile Include="Composition\Container.cs" />
     <Compile Include="Composition\IContainer.cs" />
diff --git a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
index 0aaaf840f..cbc032849 100644
--- a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
@@ -5,7 +5,7 @@ using Marr.Data;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore
diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/PagingOffsetFixture.cs
similarity index 86%
rename from src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
rename to src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/PagingOffsetFixture.cs
index 65819a686..5ece0f8a4 100644
--- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/PagingOffsetFixture.cs
@@ -1,10 +1,10 @@
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Tv;
 
-namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests
+namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
 {
     public class PagingOffsetFixture
     {
diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/ToSortDirectionFixture.cs
similarity index 90%
rename from src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
rename to src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/ToSortDirectionFixture.cs
index de74a63f2..b0eaa64c0 100644
--- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/ToSortDirectionFixture.cs
@@ -1,10 +1,10 @@
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Tv;
 
-namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests
+namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
 {
     public class ToSortDirectionFixture
     {
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 22a8d5042..2e7790ae8 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -103,8 +103,8 @@
     <Compile Include="Datastore\DatabaseRelationshipFixture.cs" />
     <Compile Include="Datastore\MappingExtentionFixture.cs" />
     <Compile Include="Datastore\ObjectDatabaseFixture.cs" />
-    <Compile Include="Datastore\PagingSpecExtenstionsTests\ToSortDirectionFixture.cs" />
-    <Compile Include="Datastore\PagingSpecExtenstionsTests\PagingOffsetFixture.cs" />
+    <Compile Include="Datastore\PagingSpecExtensionsTests\ToSortDirectionFixture.cs" />
+    <Compile Include="Datastore\PagingSpecExtensionsTests\PagingOffsetFixture.cs" />
     <Compile Include="Datastore\ReflectionStrategyFixture\Benchmarks.cs" />
     <Compile Include="Datastore\SQLiteMigrationHelperTests\AlterFixture.cs" />
     <Compile Include="Datastore\SQLiteMigrationHelperTests\DuplicateFixture.cs" />
diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
index 357463bdf..a414ea8eb 100644
--- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
@@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test.UpdateTests
             Subject.Execute(new ApplicationUpdateCommand());
 
 
-            ExceptionVerification.AssertNoUnexcpectedLogs();
+            ExceptionVerification.AssertNoUnexpectedLogs();
         }
 
         [Test]
diff --git a/src/NzbDrone.Core/Datastore/BasicRepository.cs b/src/NzbDrone.Core/Datastore/BasicRepository.cs
index bb1173b3b..ce5287472 100644
--- a/src/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -6,7 +6,7 @@ using Marr.Data;
 using Marr.Data.QGen;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Common;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Messaging.Events;
 
 
diff --git a/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs b/src/NzbDrone.Core/Datastore/Extensions/MappingExtensions.cs
similarity index 97%
rename from src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extensions/MappingExtensions.cs
index e5a000004..090c2560c 100644
--- a/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extensions/MappingExtensions.cs
@@ -4,7 +4,7 @@ using Marr.Data;
 using Marr.Data.Mapping;
 using NzbDrone.Common.Reflection;
 
-namespace NzbDrone.Core.Datastore.Extentions
+namespace NzbDrone.Core.Datastore.Extensions
 {
     public static class MappingExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs b/src/NzbDrone.Core/Datastore/Extensions/PagingSpecExtensions.cs
similarity index 96%
rename from src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extensions/PagingSpecExtensions.cs
index d5593876e..39cc5b7a6 100644
--- a/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extensions/PagingSpecExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace NzbDrone.Core.Datastore.Extentions
+namespace NzbDrone.Core.Datastore.Extensions
 {
     public static class PagingSpecExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs b/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs
similarity index 97%
rename from src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs
rename to src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs
index 6bade070f..2e40accd4 100644
--- a/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs
+++ b/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs
@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using Marr.Data;
 using Marr.Data.Mapping;
 
-namespace NzbDrone.Core.Datastore.Extentions
+namespace NzbDrone.Core.Datastore.Extensions
 {
     public static class RelationshipExtensions
     {
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index 02c728f22..74ab43f69 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -7,7 +7,7 @@ using NzbDrone.Core.Blacklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Datastore.Converters;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Instrumentation;
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index b8938f15e..5e81c437d 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -138,9 +138,9 @@
     <Compile Include="Datastore\DbFactory.cs" />
     <Compile Include="Datastore\Converters\EnumIntConverter.cs" />
     <Compile Include="Datastore\Events\ModelEvent.cs" />
-    <Compile Include="Datastore\Extentions\MappingExtensions.cs" />
-    <Compile Include="Datastore\Extentions\PagingSpecExtensions.cs" />
-    <Compile Include="Datastore\Extentions\RelationshipExtensions.cs" />
+    <Compile Include="Datastore\Extensions\MappingExtensions.cs" />
+    <Compile Include="Datastore\Extensions\PagingSpecExtensions.cs" />
+    <Compile Include="Datastore\Extensions\RelationshipExtensions.cs" />
     <Compile Include="Datastore\IEmbeddedDocument.cs" />
     <Compile Include="Datastore\LazyList.cs" />
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
diff --git a/src/NzbDrone.Core/Tv/EpisodeRepository.cs b/src/NzbDrone.Core/Tv/EpisodeRepository.cs
index 2a6a1792e..db43e8f26 100644
--- a/src/NzbDrone.Core/Tv/EpisodeRepository.cs
+++ b/src/NzbDrone.Core/Tv/EpisodeRepository.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Marr.Data.QGen;
 using NLog;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Datastore.Extentions;
+using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Qualities;
diff --git a/src/NzbDrone.Test.Common/ExceptionVerification.cs b/src/NzbDrone.Test.Common/ExceptionVerification.cs
index 6d98c912f..79bb6c2c7 100644
--- a/src/NzbDrone.Test.Common/ExceptionVerification.cs
+++ b/src/NzbDrone.Test.Common/ExceptionVerification.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Test.Common
             _logs = new List<LogEventInfo>();
         }
 
-        public static void AssertNoUnexcpectedLogs()
+        public static void AssertNoUnexpectedLogs()
         {
             ExpectedFatals(0);
             ExpectedErrors(0);
diff --git a/src/NzbDrone.Test.Common/LoggingTest.cs b/src/NzbDrone.Test.Common/LoggingTest.cs
index 4d11d696a..f7ad739fb 100644
--- a/src/NzbDrone.Test.Common/LoggingTest.cs
+++ b/src/NzbDrone.Test.Common/LoggingTest.cs
@@ -50,7 +50,7 @@ namespace NzbDrone.Test.Common
             //https://bugs.launchpad.net/nunitv2/+bug/1076932
             if (BuildInfo.IsDebug && TestContext.CurrentContext.Result.State == TestState.Success)
             {
-                ExceptionVerification.AssertNoUnexcpectedLogs();
+                ExceptionVerification.AssertNoUnexpectedLogs();
             }
         }
     }
diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 2274be620..e871e8478 100644
--- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -83,7 +83,7 @@
     <Compile Include="LoggingTest.cs" />
     <Compile Include="MockerExtensions.cs" />
     <Compile Include="NzbDroneRunner.cs" />
-    <Compile Include="ObjectExtentions.cs" />
+    <Compile Include="ObjectExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="StringExtensions.cs" />
diff --git a/src/NzbDrone.Test.Common/ObjectExtentions.cs b/src/NzbDrone.Test.Common/ObjectExtensions.cs
similarity index 85%
rename from src/NzbDrone.Test.Common/ObjectExtentions.cs
rename to src/NzbDrone.Test.Common/ObjectExtensions.cs
index 40667ef8d..702797269 100644
--- a/src/NzbDrone.Test.Common/ObjectExtentions.cs
+++ b/src/NzbDrone.Test.Common/ObjectExtensions.cs
@@ -2,7 +2,7 @@
 
 namespace NzbDrone.Test.Common
 {
-    public static class ObjectExtentions
+    public static class ObjectExtensions
     {
         public static T JsonClone<T>(this T source) where T : new()
         {