diff --git a/ICD.Common.Utils.Tests/EnumUtilsTest.cs b/ICD.Common.Utils.Tests/EnumUtilsTest.cs
index 28e845b..1b9a607 100644
--- a/ICD.Common.Utils.Tests/EnumUtilsTest.cs
+++ b/ICD.Common.Utils.Tests/EnumUtilsTest.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace ICD.Common.Utils.Tests_NetStandard
+namespace ICD.Common.Utils.Tests
 {
 	[TestFixture]
     public sealed class EnumUtilsTest
diff --git a/ICD.Common.Utils.Tests/Extensions/ByteExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/ByteExtensionsTest.cs
index b93a8b4..1fd4a15 100644
--- a/ICD.Common.Utils.Tests/Extensions/ByteExtensionsTest.cs
+++ b/ICD.Common.Utils.Tests/Extensions/ByteExtensionsTest.cs
@@ -1,7 +1,7 @@
 using ICD.Common.Utils.Extensions;
 using NUnit.Framework;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Extensions
+namespace ICD.Common.Utils.Tests.Extensions
 {
     [TestFixture]
     public sealed class ByteExtensionsTest
diff --git a/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs
index f9f8da4..f31ad4a 100644
--- a/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs
+++ b/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs
@@ -4,7 +4,7 @@ using NUnit.Framework;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Extensions
+namespace ICD.Common.Utils.Tests.Extensions
 {
 	[TestFixture]
     public sealed class EnumerableExtensionsTest
diff --git a/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs
index f05539c..19de253 100644
--- a/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs
+++ b/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs
@@ -3,7 +3,7 @@ using NUnit.Framework;
 using System.Collections.Generic;
 using System;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Extensions
+namespace ICD.Common.Utils.Tests.Extensions
 {
 	[TestFixture]
     public sealed class ListExtensionsTest
diff --git a/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs
index 793e0e1..4b42b16 100644
--- a/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs
+++ b/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using System.Linq;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Extensions
+namespace ICD.Common.Utils.Tests.Extensions
 {
     [TestFixture]
     public sealed class StringExtensionsTest
diff --git a/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs b/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs
index 55fb49b..e5349a4 100644
--- a/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs
+++ b/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs
@@ -1,7 +1,7 @@
 using ICD.Common.Services.Logging;
 using NUnit.Framework;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Services.Logging
+namespace ICD.Common.Utils.Tests.Services.Logging
 {
     [TestFixture]
     public sealed class LogItemEventArgsTest
diff --git a/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs b/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs
index 8365bad..ad1f37b 100644
--- a/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs
+++ b/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs
@@ -3,7 +3,7 @@ using ICD.Common.Services.Logging;
 using NUnit.Framework;
 using System;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Services.Logging
+namespace ICD.Common.Utils.Tests.Services.Logging
 {
     [UsedImplicitly, TestFixture]
     public sealed class LogItemTest
diff --git a/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs b/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs
index d858be7..73d2792 100644
--- a/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs
+++ b/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs
@@ -1,7 +1,7 @@
 using ICD.Common.Services.Logging;
 using NUnit.Framework;
 
-namespace ICD.Common.Utils.Tests_NetStandard.Services.Logging
+namespace ICD.Common.Utils.Tests.Services.Logging
 {
     [TestFixture]
     public sealed class SeverityEventArgsTest