diff --git a/src/CSharpFunctionalExtensions.FluentAssertions/MaybeExtensions.cs b/src/CSharpFunctionalExtensions.FluentAssertions/MaybeExtensions.cs
index 446e2b1..a53b6cc 100644
--- a/src/CSharpFunctionalExtensions.FluentAssertions/MaybeExtensions.cs
+++ b/src/CSharpFunctionalExtensions.FluentAssertions/MaybeExtensions.cs
@@ -1,8 +1,8 @@
-using FluentAssertions;
+using CSharpFunctionalExtensions;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace CSharpFunctionalExtensions.FluentAssertions;
+namespace FluentAssertions;
 
 public static class MaybeExtensions
 {
@@ -14,7 +14,7 @@ public class MaybeAssertions<T> : ReferenceTypeAssertions<Maybe<T>, MaybeAsserti
     public MaybeAssertions(Maybe<T> instance) : base(instance) { }
 
     protected override string Identifier => "Maybe{T}";
-    
+
     /// <summary>
     /// Asserts that the current <see cref="Maybe{T}"/> has some value.
     /// </summary>
diff --git a/src/CSharpFunctionalExtensions.FluentAssertions/ResultExtensions.cs b/src/CSharpFunctionalExtensions.FluentAssertions/ResultExtensions.cs
index b627964..b6bdd3d 100644
--- a/src/CSharpFunctionalExtensions.FluentAssertions/ResultExtensions.cs
+++ b/src/CSharpFunctionalExtensions.FluentAssertions/ResultExtensions.cs
@@ -1,8 +1,8 @@
-using FluentAssertions;
+using CSharpFunctionalExtensions;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace CSharpFunctionalExtensions.FluentAssertions;
+namespace FluentAssertions;
 
 public static class ResultExtensions
 {
diff --git a/src/CSharpFunctionalExtensions.FluentAssertions/ResultTEExtensions.cs b/src/CSharpFunctionalExtensions.FluentAssertions/ResultTEExtensions.cs
index 16c2fed..62ecd26 100644
--- a/src/CSharpFunctionalExtensions.FluentAssertions/ResultTEExtensions.cs
+++ b/src/CSharpFunctionalExtensions.FluentAssertions/ResultTEExtensions.cs
@@ -1,8 +1,8 @@
-using FluentAssertions.Execution;
+using CSharpFunctionalExtensions;
+using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
-using FluentAssertions;
 
-namespace CSharpFunctionalExtensions.FluentAssertions;
+namespace FluentAssertions;
 public static class ResultTEExtensions
 {
     public static ResultTEAssertions<T, E> Should<T, E>(this Result<T, E> instance) => new(instance);
diff --git a/src/CSharpFunctionalExtensions.FluentAssertions/ResultTExtensions.cs b/src/CSharpFunctionalExtensions.FluentAssertions/ResultTExtensions.cs
index 5cd87fb..6224b1b 100644
--- a/src/CSharpFunctionalExtensions.FluentAssertions/ResultTExtensions.cs
+++ b/src/CSharpFunctionalExtensions.FluentAssertions/ResultTExtensions.cs
@@ -1,8 +1,8 @@
-using FluentAssertions;
+using CSharpFunctionalExtensions;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace CSharpFunctionalExtensions.FluentAssertions;
+namespace FluentAssertions;
 
 public static class ResultTExtensions
 {
diff --git a/src/CSharpFunctionalExtensions.FluentAssertions/UnitResultExtensions.cs b/src/CSharpFunctionalExtensions.FluentAssertions/UnitResultExtensions.cs
index 542d898..c7abb42 100644
--- a/src/CSharpFunctionalExtensions.FluentAssertions/UnitResultExtensions.cs
+++ b/src/CSharpFunctionalExtensions.FluentAssertions/UnitResultExtensions.cs
@@ -1,8 +1,8 @@
-using FluentAssertions.Execution;
+using CSharpFunctionalExtensions;
+using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
-using FluentAssertions;
 
-namespace CSharpFunctionalExtensions.FluentAssertions;
+namespace FluentAssertions;
 public static class UnitResultExtensions
 {
     public static UnitResultAssertions<E> Should<E>(this UnitResult<E> instance) => new(instance);
diff --git a/tests/CSharpFunctionalExtensions.FluentAssertions.Tests/MaybeAssertionsTests.cs b/tests/CSharpFunctionalExtensions.FluentAssertions.Tests/MaybeAssertionsTests.cs
index b25c8fe..0faa5a9 100644
--- a/tests/CSharpFunctionalExtensions.FluentAssertions.Tests/MaybeAssertionsTests.cs
+++ b/tests/CSharpFunctionalExtensions.FluentAssertions.Tests/MaybeAssertionsTests.cs
@@ -27,7 +27,7 @@ public void WhenMaybeIsExpectedToHaveValueAndItHasWrongValueShouldThrow()
     {
         var maybe = Maybe.From("oops");
 
-        Action act = () => maybe.Should().HaveValue("test", "it is test");
+        var act = () => maybe.Should().HaveValue("test", "it is test");
 
         act.Should().Throw<Exception>().WithMessage($"*value \"test\" because it is test, but with value \"oops\" it*");
     }
@@ -37,7 +37,7 @@ public void WhenMaybeIsExpectedToHaveValueAndItDoesNotShouldThrow()
     {
         Maybe<string> maybe = null;
 
-        Action act = () => maybe.Should().HaveValue("test", "it is not None");
+        var act = () => maybe.Should().HaveValue("test", "it is not None");
 
         act.Should().Throw<Exception>().WithMessage($"*value \"test\" because it is not None*");
     }
@@ -55,7 +55,7 @@ public void WhenMaybeIsExpectedToHaveNoValueAndItHasOneShouldThrow()
     {
         var maybe = Maybe.From("test");
 
-        Action act = () => maybe.Should().HaveNoValue("it is None");
+        var act = () => maybe.Should().HaveNoValue("it is None");
 
         act.Should().Throw<Exception>().WithMessage($"*Maybe to have no value because it is None, but with value \"test\" it*");
     }