diff --git a/Source/Sundew.CommandLine.AcceptanceTests/ArgumentWithDashTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/ArgumentWithDashTests.cs
index 9621a2d..6880d61 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/ArgumentWithDashTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/ArgumentWithDashTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentWithDashTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentWithDashTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.AcceptanceTests;
 using System.Collections.Generic;
 using System.Globalization;
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class ArgumentWithDashTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/BatchArguments.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/BatchArguments.cs
index cb03af8..431d7b1 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/BatchArguments.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/BatchArguments.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BatchArguments.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="BatchArguments.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.AcceptanceTests.CommandlineBatcher;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Sundew.Base.Primitives.Numeric;
+using Sundew.Base.Numeric;
 using Sundew.Base.Text;
 using Sundew.CommandLine;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Command.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Command.cs
index 5f0657f..90d1015 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Command.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Command.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Command.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Command.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/CommandLineBatcherTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/CommandLineBatcherTests.cs
index e2d0ba4..7225234 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/CommandLineBatcherTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/CommandLineBatcherTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineBatcherTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineBatcherTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -10,7 +10,7 @@ namespace Sundew.CommandLine.AcceptanceTests.CommandlineBatcher;
 using System;
 using System.Linq;
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class CommandLineBatcherTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Values.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Values.cs
index f11bc07..b5ac7d6 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Values.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandLineBatcher/Values.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Values.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Values.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/BatchSeparation.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/BatchSeparation.cs
index bcd0839..fd2c0af 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/BatchSeparation.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/BatchSeparation.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BatchSeparation.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="BatchSeparation.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/ExecutionOrder.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/ExecutionOrder.cs
index cf2cc17..d5ddf83 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/ExecutionOrder.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/ExecutionOrder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ExecutionOrder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ExecutionOrder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/MatchVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/MatchVerb.cs
index cdbd08f..dba6a17 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/MatchVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/MatchVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MatchVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="MatchVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Parallelize.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Parallelize.cs
index b660908..9eaf132 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Parallelize.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Parallelize.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Parallelize.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Parallelize.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Verbosity.cs b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Verbosity.cs
index 857df6c..7322aab 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Verbosity.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/CommandlineBatcher/Verbosity.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Verbosity.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Verbosity.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/EmptyArgumentsTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/EmptyArgumentsTests.cs
index c90d890..80471a5 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/EmptyArgumentsTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/EmptyArgumentsTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EmptyArgumentsTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="EmptyArgumentsTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class EmptyArgumentsTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/GenerateParseTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/GenerateParseTests.cs
index 338a0fe..aa93f4d 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/GenerateParseTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/GenerateParseTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="GenerateParseTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="GenerateParseTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -10,7 +10,7 @@ namespace Sundew.CommandLine.AcceptanceTests;
 using System;
 using System.Collections.Generic;
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.AcceptanceTests.Verbs;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Git/CommitTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Git/CommitTests.cs
index 4ffcb3f..f7f5e8f 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Git/CommitTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Git/CommitTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommitTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommitTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Git;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Git.CommandLine;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Git/InitTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Git/InitTests.cs
index 8cefdad..1b544be 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Git/InitTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Git/InitTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InitTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="InitTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Git;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Git.CommandLine;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Git/LargeFileSystem/LfsTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Git/LargeFileSystem/LfsTests.cs
index 647e4f7..4d87530 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Git/LargeFileSystem/LfsTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Git/LargeFileSystem/LfsTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LfsTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="LfsTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Git.LargeFileSystem;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Git.CommandLine.LargeFileSystem;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Git/PushTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Git/PushTests.cs
index f0fb51e..06afc06 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Git/PushTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Git/PushTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PushTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="PushTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Git;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Git.CommandLine;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/InvalidConfigurationTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/InvalidConfigurationTests.cs
index 1f5d4f2..bbeff7f 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/InvalidConfigurationTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/InvalidConfigurationTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InvalidConfigurationTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="InvalidConfigurationTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class InvalidConfigurationTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/InvalidOptionTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/InvalidOptionTests.cs
index 4c77ee7..4dc0a73 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/InvalidOptionTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/InvalidOptionTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InvalidOptionTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="InvalidOptionTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class InvalidOptionTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/NestedVerbsTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/NestedVerbsTests.cs
index 51ce25d..4ea5e14 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/NestedVerbsTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/NestedVerbsTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NestedVerbsTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="NestedVerbsTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.AcceptanceTests.Verbs;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Properties/AssemblyInfo.cs b/Source/Sundew.CommandLine.AcceptanceTests/Properties/AssemblyInfo.cs
index 7b19328..14e0b2e 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Properties/AssemblyInfo.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="AssemblyInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -10,4 +10,4 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyCopyright("Copyright © Hukano 2017")]
+[assembly: AssemblyCopyright("Copyright © Sundews 2017")]
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/AupliCommandLineTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/AupliCommandLineTests.cs
index 8d79521..07f1123 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/AupliCommandLineTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/AupliCommandLineTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AupliCommandLineTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="AupliCommandLineTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Samples.Aupli;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class AupliCommandLineTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/FileLogOptions.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/FileLogOptions.cs
index a5f8cfc..44692d3 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/FileLogOptions.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/FileLogOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="FileLogOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="FileLogOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/Options.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/Options.cs
index 91c7eb2..c98310a 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/Options.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/Aupli/Options.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Options.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Options.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/CredentialOptions.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/CredentialOptions.cs
index 91170d1..9a07e5f 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/CredentialOptions.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/CredentialOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CredentialOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CredentialOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/ICredentials.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/ICredentials.cs
index 8648b24..8d45fd7 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/ICredentials.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/ICredentials.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ICredentials.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ICredentials.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/IRunOptions.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/IRunOptions.cs
index e5de955..e4aed20 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/IRunOptions.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/IRunOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IRunOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IRunOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/InstallVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/InstallVerb.cs
index fd947eb..de53645 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/InstallVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/InstallVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InstallVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="InstallVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/KuandoBusylightForTeamCityTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/KuandoBusylightForTeamCityTests.cs
index c399426..147b345 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/KuandoBusylightForTeamCityTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/KuandoBusylightForTeamCityTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="KuandoBusylightForTeamCityTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="KuandoBusylightForTeamCityTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine.AcceptanceTests.Samples.KuandoBusylightForTeamCity;
 
 using System.Net;
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class KuandoBusylightForTeamCityTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/RunOptions.cs b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/RunOptions.cs
index 60be8a1..51ccc82 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/RunOptions.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Samples/KuandoBusylightForTeamCity/RunOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RunOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="RunOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine.AcceptanceTests.Samples.KuandoBusylightForTeamCity;
 
 using System;
 using System.Collections.Generic;
-using Sundew.Base.Primitives.Numeric;
+using Sundew.Base.Numeric;
 
 public class RunOptions : IArguments, IRunOptions
 {
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/AllVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/AllVerb.cs
index cc8eb6c..8b03db3 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/AllVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/AllVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AllVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="AllVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/AwaitPublishVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/AwaitPublishVerb.cs
index 6a37aec..2cc591a 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/AwaitPublishVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/AwaitPublishVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AwaitPublishVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="AwaitPublishVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/CommonOptions.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/CommonOptions.cs
index e37b794..28fd13f 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/CommonOptions.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/CommonOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommonOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommonOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/DeleteVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/DeleteVerb.cs
index 5507877..b8d7d8d 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/DeleteVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/DeleteVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="DeleteVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="DeleteVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/IPruneModeVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/IPruneModeVerb.cs
index bb19629..ea02611 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/IPruneModeVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/IPruneModeVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IPruneModeVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IPruneModeVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/PackageId.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/PackageId.cs
index 1a7fdcb..976bca8 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/PackageId.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/PackageId.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PackageId.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="PackageId.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/PruneLocalSourceVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/PruneLocalSourceVerb.cs
index 7ce9a9b..31a0bc1 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/PruneLocalSourceVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/PruneLocalSourceVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PruneLocalSourceVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="PruneLocalSourceVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/SptTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/SptTests.cs
index c927a1b..9803c4f 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/SptTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/SptTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SptTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="SptTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Spt;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Xunit;
 
 public class SptTests
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spt/UpdateVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spt/UpdateVerb.cs
index 95a5ba1..b2f2e69 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spt/UpdateVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spt/UpdateVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="UpdateVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="UpdateVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spu/Arguments.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spu/Arguments.cs
index ec8f35a..9a311ea 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spu/Arguments.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spu/Arguments.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Arguments.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Arguments.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spu/PackageId.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spu/PackageId.cs
index 374879d..77d1691 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spu/PackageId.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spu/PackageId.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PackageId.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="PackageId.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Spu/SpuTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/Spu/SpuTests.cs
index 9d37542..76c37a8 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Spu/SpuTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Spu/SpuTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SpuTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="SpuTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -10,7 +10,7 @@ namespace Sundew.CommandLine.AcceptanceTests.Spu;
 using System;
 using System.Collections.Generic;
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Base.Text;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Sundew.CommandLine.AcceptanceTests.csproj b/Source/Sundew.CommandLine.AcceptanceTests/Sundew.CommandLine.AcceptanceTests.csproj
index 61f34b1..2ba4037 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Sundew.CommandLine.AcceptanceTests.csproj
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Sundew.CommandLine.AcceptanceTests.csproj
@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <NoWarn>SA0001</NoWarn>
+    <NoWarn>SA0001;SA1402</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,12 +23,12 @@
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NuGet.Versioning" Version="6.8.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/VerbWithoutArgumentTests.cs b/Source/Sundew.CommandLine.AcceptanceTests/VerbWithoutArgumentTests.cs
index 8f11ac2..73a5915 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/VerbWithoutArgumentTests.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/VerbWithoutArgumentTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VerbWithoutArgumentTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="VerbWithoutArgumentTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests;
 
 using FluentAssertions;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.AcceptanceTests.Verbs;
 using Xunit;
 
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/BuildVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/BuildVerb.cs
index c3fa2ed..4525a47 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/BuildVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/BuildVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BuildVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="BuildVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ExecuteVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ExecuteVerb.cs
index 370a151..3f823d1 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ExecuteVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ExecuteVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ExecuteVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ExecuteVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ParameterLessVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ParameterLessVerb.cs
index 85ff285..70a276a 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ParameterLessVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ParameterLessVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ParameterLessVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ParameterLessVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ProgramVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ProgramVerb.cs
index d636fe0..1041a0c 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ProgramVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/ProgramVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ProgramVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ProgramVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunGeneratorVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunGeneratorVerb.cs
index 89b8631..7c8afc2 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunGeneratorVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunGeneratorVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RunGeneratorVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="RunGeneratorVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.AcceptanceTests.Verbs;
 
 using System.Collections.Generic;
-using Sundew.Base.Primitives;
+using Sundew.Base;
 
 public enum Mode
 {
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunVerb.cs
index 279a05a..9e993ca 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/RunVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RunVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="RunVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/TestsVerb.cs b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/TestsVerb.cs
index 76150d2..ab818d2 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/Verbs/TestsVerb.cs
+++ b/Source/Sundew.CommandLine.AcceptanceTests/Verbs/TestsVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="TestsVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="TestsVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.AcceptanceTests/stylecop.json b/Source/Sundew.CommandLine.AcceptanceTests/stylecop.json
index 5c9b4a4..1e09d22 100644
--- a/Source/Sundew.CommandLine.AcceptanceTests/stylecop.json
+++ b/Source/Sundew.CommandLine.AcceptanceTests/stylecop.json
@@ -8,7 +8,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "Hukano",
+      "companyName": "Sundews",
       "xmlHeader": true,
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information.",
       "headerDecoration": "--------------------------------------------------------------------------------------------------------------------",
diff --git a/Source/Sundew.CommandLine.UnitTests/Internals/StringExtensionTests.cs b/Source/Sundew.CommandLine.UnitTests/Internals/StringExtensionTests.cs
index e6e2847..2ee5344 100644
--- a/Source/Sundew.CommandLine.UnitTests/Internals/StringExtensionTests.cs
+++ b/Source/Sundew.CommandLine.UnitTests/Internals/StringExtensionTests.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="StringExtensionTests.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="StringExtensionTests.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine.UnitTests/Sundew.CommandLine.UnitTests.csproj b/Source/Sundew.CommandLine.UnitTests/Sundew.CommandLine.UnitTests.csproj
index 325e1f0..d6d2979 100644
--- a/Source/Sundew.CommandLine.UnitTests/Sundew.CommandLine.UnitTests.csproj
+++ b/Source/Sundew.CommandLine.UnitTests/Sundew.CommandLine.UnitTests.csproj
@@ -19,12 +19,12 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Source/Sundew.CommandLine.UnitTests/stylecop.json b/Source/Sundew.CommandLine.UnitTests/stylecop.json
index 5c9b4a4..1e09d22 100644
--- a/Source/Sundew.CommandLine.UnitTests/stylecop.json
+++ b/Source/Sundew.CommandLine.UnitTests/stylecop.json
@@ -8,7 +8,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "Hukano",
+      "companyName": "Sundews",
       "xmlHeader": true,
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information.",
       "headerDecoration": "--------------------------------------------------------------------------------------------------------------------",
diff --git a/Source/Sundew.CommandLine/ArgumentsBuilderException.cs b/Source/Sundew.CommandLine/ArgumentsBuilderException.cs
index 946542a..08aa6a5 100644
--- a/Source/Sundew.CommandLine/ArgumentsBuilderException.cs
+++ b/Source/Sundew.CommandLine/ArgumentsBuilderException.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentsBuilderException.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentsBuilderException.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/CommandLineGenerator.cs b/Source/Sundew.CommandLine/CommandLineGenerator.cs
index e6bf726..ea6237f 100644
--- a/Source/Sundew.CommandLine/CommandLineGenerator.cs
+++ b/Source/Sundew.CommandLine/CommandLineGenerator.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineGenerator.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineGenerator.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine;
 
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.Internal;
 
 /// <summary>
@@ -68,7 +68,7 @@ public R<string, GeneratorError> Generate(IVerb? verb, bool useAliases)
         }
 
         return CommandLineArgumentsGenerator.Generate(verb, stringBuilder, this.Settings, useAliases)
-            .To(stringBuilder.ToString());
+            .With(stringBuilder.ToString());
     }
 
     /// <summary>Generates the specified verb.</summary>
@@ -87,6 +87,6 @@ public R<string, GeneratorError> Generate(IArguments arguments, bool useAliases)
     {
         var stringBuilder = new StringBuilder();
         return CommandLineArgumentsGenerator.Generate(arguments, stringBuilder, this.Settings, useAliases)
-            .To(stringBuilder.ToString());
+            .With(stringBuilder.ToString());
     }
 }
\ No newline at end of file
diff --git a/Source/Sundew.CommandLine/CommandLineParser{TSuccess,TError}.cs b/Source/Sundew.CommandLine/CommandLineParser{TSuccess,TError}.cs
index ac77a62..09048e6 100644
--- a/Source/Sundew.CommandLine/CommandLineParser{TSuccess,TError}.cs
+++ b/Source/Sundew.CommandLine/CommandLineParser{TSuccess,TError}.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineParser{TSuccess,TError}.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineParser{TSuccess,TError}.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,8 +11,8 @@ namespace Sundew.CommandLine;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Sundew.Base;
 using Sundew.Base.Collections;
-using Sundew.Base.Primitives.Computation;
 using Sundew.CommandLine.Extensions;
 using Sundew.CommandLine.Internal;
 using Sundew.CommandLine.Internal.Verbs;
@@ -344,7 +344,7 @@ private ValueTask<R<TSuccess, ParserError<TError>>> ParseArguments<TArguments>(
         var result = this.commandLineArgumentsParser.Parse(argumentsBuilder, this.Settings, argumentList, false);
         if (!result)
         {
-            return result.To(default(TSuccess)!, parserError => new ParserError<TError>(parserError));
+            return result.With(default(TSuccess)!, parserError => new ParserError<TError>(parserError));
         }
 
         return argumentsHandler(argumentsDefinition);
diff --git a/Source/Sundew.CommandLine/Extensions/ReadOnlyMemoryExtensions.cs b/Source/Sundew.CommandLine/Extensions/ReadOnlyMemoryExtensions.cs
index 9d67f04..8b95c16 100644
--- a/Source/Sundew.CommandLine/Extensions/ReadOnlyMemoryExtensions.cs
+++ b/Source/Sundew.CommandLine/Extensions/ReadOnlyMemoryExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ReadOnlyMemoryExtensions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ReadOnlyMemoryExtensions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/GeneratorError.cs b/Source/Sundew.CommandLine/GeneratorError.cs
index 857f7ef..b90c7bd 100644
--- a/Source/Sundew.CommandLine/GeneratorError.cs
+++ b/Source/Sundew.CommandLine/GeneratorError.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="GeneratorError.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="GeneratorError.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/GeneratorErrorType.cs b/Source/Sundew.CommandLine/GeneratorErrorType.cs
index 29871ee..e453ed5 100644
--- a/Source/Sundew.CommandLine/GeneratorErrorType.cs
+++ b/Source/Sundew.CommandLine/GeneratorErrorType.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="GeneratorErrorType.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="GeneratorErrorType.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/GlobalSuppressions.cs b/Source/Sundew.CommandLine/GlobalSuppressions.cs
index e9b41c8..d66eb17 100644
--- a/Source/Sundew.CommandLine/GlobalSuppressions.cs
+++ b/Source/Sundew.CommandLine/GlobalSuppressions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="GlobalSuppressions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="GlobalSuppressions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IArgumentHelpInfo.cs b/Source/Sundew.CommandLine/IArgumentHelpInfo.cs
index 1957fa5..0ab55b7 100644
--- a/Source/Sundew.CommandLine/IArgumentHelpInfo.cs
+++ b/Source/Sundew.CommandLine/IArgumentHelpInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArgumentHelpInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArgumentHelpInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IArgumentInfo.cs b/Source/Sundew.CommandLine/IArgumentInfo.cs
index 735fab2..45e87d4 100644
--- a/Source/Sundew.CommandLine/IArgumentInfo.cs
+++ b/Source/Sundew.CommandLine/IArgumentInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArgumentInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArgumentInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IArgumentMissingInfo.cs b/Source/Sundew.CommandLine/IArgumentMissingInfo.cs
index 43081c9..eb60e22 100644
--- a/Source/Sundew.CommandLine/IArgumentMissingInfo.cs
+++ b/Source/Sundew.CommandLine/IArgumentMissingInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArgumentMissingInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArgumentMissingInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IArguments.cs b/Source/Sundew.CommandLine/IArguments.cs
index 8058a04..82ac170 100644
--- a/Source/Sundew.CommandLine/IArguments.cs
+++ b/Source/Sundew.CommandLine/IArguments.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArguments.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArguments.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IArgumentsBuilder.cs b/Source/Sundew.CommandLine/IArgumentsBuilder.cs
index 25363ba..5a1022f 100644
--- a/Source/Sundew.CommandLine/IArgumentsBuilder.cs
+++ b/Source/Sundew.CommandLine/IArgumentsBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArgumentsBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArgumentsBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IChoiceBuilder.cs b/Source/Sundew.CommandLine/IChoiceBuilder.cs
index e8ec5e9..070627f 100644
--- a/Source/Sundew.CommandLine/IChoiceBuilder.cs
+++ b/Source/Sundew.CommandLine/IChoiceBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IChoiceBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IChoiceBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/ICommandLineBuilder.cs b/Source/Sundew.CommandLine/ICommandLineBuilder.cs
index 6108bdd..b57d13d 100644
--- a/Source/Sundew.CommandLine/ICommandLineBuilder.cs
+++ b/Source/Sundew.CommandLine/ICommandLineBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ICommandLineBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ICommandLineBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine;
 
 using System;
 using System.Threading.Tasks;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 /// <summary>
 /// Interface for implementing a command line builder.
diff --git a/Source/Sundew.CommandLine/ICommandLineGenerator.cs b/Source/Sundew.CommandLine/ICommandLineGenerator.cs
index bf59a09..ccde3f0 100644
--- a/Source/Sundew.CommandLine/ICommandLineGenerator.cs
+++ b/Source/Sundew.CommandLine/ICommandLineGenerator.cs
@@ -1,13 +1,13 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ICommandLineGenerator.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ICommandLineGenerator.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace Sundew.CommandLine;
 
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 /// <summary>
 /// Interface for implementing a command line generator.
diff --git a/Source/Sundew.CommandLine/ICommandLineHelper.cs b/Source/Sundew.CommandLine/ICommandLineHelper.cs
index f139a81..4c8e1a5 100644
--- a/Source/Sundew.CommandLine/ICommandLineHelper.cs
+++ b/Source/Sundew.CommandLine/ICommandLineHelper.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ICommandLineHelper.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ICommandLineHelper.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/ICommandLineParser.cs b/Source/Sundew.CommandLine/ICommandLineParser.cs
index ffe3a5e..e33bce4 100644
--- a/Source/Sundew.CommandLine/ICommandLineParser.cs
+++ b/Source/Sundew.CommandLine/ICommandLineParser.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ICommandLineParser.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ICommandLineParser.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -10,7 +10,7 @@ namespace Sundew.CommandLine;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 /// <summary>
 /// Interface for implementing the command line parser.
diff --git a/Source/Sundew.CommandLine/IVerb.cs b/Source/Sundew.CommandLine/IVerb.cs
index 1303b4d..943a0b3 100644
--- a/Source/Sundew.CommandLine/IVerb.cs
+++ b/Source/Sundew.CommandLine/IVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/IVerbBuilder.cs b/Source/Sundew.CommandLine/IVerbBuilder.cs
index 2b7f03e..63f5da6 100644
--- a/Source/Sundew.CommandLine/IVerbBuilder.cs
+++ b/Source/Sundew.CommandLine/IVerbBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IVerbBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IVerbBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine;
 
 using System;
 using System.Threading.Tasks;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 /// <summary>Interface for building verbs.</summary>
 /// <typeparam name="TSuccess">The type of the success.</typeparam>
diff --git a/Source/Sundew.CommandLine/Internal/ArgumentList.cs b/Source/Sundew.CommandLine/Internal/ArgumentList.cs
index 0f90d03..c31ecbc 100644
--- a/Source/Sundew.CommandLine/Internal/ArgumentList.cs
+++ b/Source/Sundew.CommandLine/Internal/ArgumentList.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentList.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentList.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/ArgumentRegistry.cs b/Source/Sundew.CommandLine/Internal/ArgumentRegistry.cs
index 69bf4cd..7785457 100644
--- a/Source/Sundew.CommandLine/Internal/ArgumentRegistry.cs
+++ b/Source/Sundew.CommandLine/Internal/ArgumentRegistry.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentRegistry.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentRegistry.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/ArgumentSeparation.cs b/Source/Sundew.CommandLine/Internal/ArgumentSeparation.cs
index 7e623a2..a940b8b 100644
--- a/Source/Sundew.CommandLine/Internal/ArgumentSeparation.cs
+++ b/Source/Sundew.CommandLine/Internal/ArgumentSeparation.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentSeparation.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentSeparation.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/ArgumentsAction.cs b/Source/Sundew.CommandLine/Internal/ArgumentsAction.cs
index 9d37624..2236d79 100644
--- a/Source/Sundew.CommandLine/Internal/ArgumentsAction.cs
+++ b/Source/Sundew.CommandLine/Internal/ArgumentsAction.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentsAction.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentsAction.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine.Internal;
 
 using System;
 using System.Threading.Tasks;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.Internal.Helpers;
 
 internal class ArgumentsAction<TSuccess, TError> : IArgumentsBuilderProvider
diff --git a/Source/Sundew.CommandLine/Internal/ArgumentsBuilder.cs b/Source/Sundew.CommandLine/Internal/ArgumentsBuilder.cs
index 53c53ea..764b8a9 100644
--- a/Source/Sundew.CommandLine/Internal/ArgumentsBuilder.cs
+++ b/Source/Sundew.CommandLine/Internal/ArgumentsBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ArgumentsBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ArgumentsBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/ChoiceBuilder.cs b/Source/Sundew.CommandLine/Internal/ChoiceBuilder.cs
index 1e777da..8d1d8a9 100644
--- a/Source/Sundew.CommandLine/Internal/ChoiceBuilder.cs
+++ b/Source/Sundew.CommandLine/Internal/ChoiceBuilder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ChoiceBuilder.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ChoiceBuilder.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/CommandLineArgumentsGenerator.cs b/Source/Sundew.CommandLine/Internal/CommandLineArgumentsGenerator.cs
index 4f68002..0a63c46 100644
--- a/Source/Sundew.CommandLine/Internal/CommandLineArgumentsGenerator.cs
+++ b/Source/Sundew.CommandLine/Internal/CommandLineArgumentsGenerator.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineArgumentsGenerator.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineArgumentsGenerator.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine.Internal;
 
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 internal static class CommandLineArgumentsGenerator
 {
diff --git a/Source/Sundew.CommandLine/Internal/CommandLineArgumentsParser.cs b/Source/Sundew.CommandLine/Internal/CommandLineArgumentsParser.cs
index 61ccde0..6da39c6 100644
--- a/Source/Sundew.CommandLine/Internal/CommandLineArgumentsParser.cs
+++ b/Source/Sundew.CommandLine/Internal/CommandLineArgumentsParser.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineArgumentsParser.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineArgumentsParser.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.Internal;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Base.Text;
 
 internal class CommandLineArgumentsParser
diff --git a/Source/Sundew.CommandLine/Internal/CommandLineHelpGenerator.cs b/Source/Sundew.CommandLine/Internal/CommandLineHelpGenerator.cs
index 46a4ac4..18629b1 100644
--- a/Source/Sundew.CommandLine/Internal/CommandLineHelpGenerator.cs
+++ b/Source/Sundew.CommandLine/Internal/CommandLineHelpGenerator.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommandLineHelpGenerator.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommandLineHelpGenerator.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Constants.cs b/Source/Sundew.CommandLine/Internal/Constants.cs
index 858c6f6..148fff5 100644
--- a/Source/Sundew.CommandLine/Internal/Constants.cs
+++ b/Source/Sundew.CommandLine/Internal/Constants.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Constants.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Constants.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Enums/EnumSerializer.cs b/Source/Sundew.CommandLine/Internal/Enums/EnumSerializer.cs
index 8a18076..8924b5e 100644
--- a/Source/Sundew.CommandLine/Internal/Enums/EnumSerializer.cs
+++ b/Source/Sundew.CommandLine/Internal/Enums/EnumSerializer.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EnumSerializer.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="EnumSerializer.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,8 +11,8 @@ namespace Sundew.CommandLine.Internal.Enums;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Sundew.Base;
 using Sundew.Base.Memory;
-using Sundew.Base.Primitives;
 using Sundew.Base.Text;
 
 internal class EnumSerializer<TEnum>
diff --git a/Source/Sundew.CommandLine/Internal/Extensions/StringBuilderExtensions.cs b/Source/Sundew.CommandLine/Internal/Extensions/StringBuilderExtensions.cs
index e630b66..be8ec12 100644
--- a/Source/Sundew.CommandLine/Internal/Extensions/StringBuilderExtensions.cs
+++ b/Source/Sundew.CommandLine/Internal/Extensions/StringBuilderExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="StringBuilderExtensions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="StringBuilderExtensions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Extensions/StringExtensions.cs b/Source/Sundew.CommandLine/Internal/Extensions/StringExtensions.cs
index 3d0cd25..43b3b34 100644
--- a/Source/Sundew.CommandLine/Internal/Extensions/StringExtensions.cs
+++ b/Source/Sundew.CommandLine/Internal/Extensions/StringExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="StringExtensions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="StringExtensions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Helpers/HelpTextHelper.cs b/Source/Sundew.CommandLine/Internal/Helpers/HelpTextHelper.cs
index 2aacb1a..5209ba1 100644
--- a/Source/Sundew.CommandLine/Internal/Helpers/HelpTextHelper.cs
+++ b/Source/Sundew.CommandLine/Internal/Helpers/HelpTextHelper.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HelpTextHelper.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="HelpTextHelper.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Helpers/SerializationHelper.cs b/Source/Sundew.CommandLine/Internal/Helpers/SerializationHelper.cs
index 6e15948..9dcfc8f 100644
--- a/Source/Sundew.CommandLine/Internal/Helpers/SerializationHelper.cs
+++ b/Source/Sundew.CommandLine/Internal/Helpers/SerializationHelper.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SerializationHelper.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="SerializationHelper.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/IArgumentsBuilderProvider.cs b/Source/Sundew.CommandLine/Internal/IArgumentsBuilderProvider.cs
index 9e4bfb0..1455665 100644
--- a/Source/Sundew.CommandLine/Internal/IArgumentsBuilderProvider.cs
+++ b/Source/Sundew.CommandLine/Internal/IArgumentsBuilderProvider.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IArgumentsBuilderProvider.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IArgumentsBuilderProvider.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/IListSerializationInfo.cs b/Source/Sundew.CommandLine/Internal/IListSerializationInfo.cs
index cfa1f59..af4a473 100644
--- a/Source/Sundew.CommandLine/Internal/IListSerializationInfo.cs
+++ b/Source/Sundew.CommandLine/Internal/IListSerializationInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IListSerializationInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IListSerializationInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/INamedArgumentInfo.cs b/Source/Sundew.CommandLine/Internal/INamedArgumentInfo.cs
index 2094c1d..3b5fd6c 100644
--- a/Source/Sundew.CommandLine/Internal/INamedArgumentInfo.cs
+++ b/Source/Sundew.CommandLine/Internal/INamedArgumentInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="INamedArgumentInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="INamedArgumentInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/IOption.cs b/Source/Sundew.CommandLine/Internal/IOption.cs
index 2cbc3e4..aa6a084 100644
--- a/Source/Sundew.CommandLine/Internal/IOption.cs
+++ b/Source/Sundew.CommandLine/Internal/IOption.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IOption.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IOption.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine.Internal;
 
 using System;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 internal interface IOption : INamedArgumentInfo, IArgumentHelpInfo, IArgumentMissingInfo
 {
diff --git a/Source/Sundew.CommandLine/Internal/IValue.cs b/Source/Sundew.CommandLine/Internal/IValue.cs
index b018b63..0929d51 100644
--- a/Source/Sundew.CommandLine/Internal/IValue.cs
+++ b/Source/Sundew.CommandLine/Internal/IValue.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IValue.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IValue.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -9,7 +9,7 @@ namespace Sundew.CommandLine.Internal;
 
 using System;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 internal interface IValue : IArgumentInfo, IArgumentMissingInfo
 {
diff --git a/Source/Sundew.CommandLine/Internal/Options/ListOption.cs b/Source/Sundew.CommandLine/Internal/Options/ListOption.cs
index 763ad74..c586b71 100644
--- a/Source/Sundew.CommandLine/Internal/Options/ListOption.cs
+++ b/Source/Sundew.CommandLine/Internal/Options/ListOption.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ListOption.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ListOption.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -12,8 +12,8 @@ namespace Sundew.CommandLine.Internal.Options;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using Sundew.Base;
 using Sundew.Base.Collections;
-using Sundew.Base.Primitives.Computation;
 using Sundew.CommandLine.Internal.Helpers;
 
 internal class ListOption<TValue> : IOption, IListSerializationInfo<TValue>
diff --git a/Source/Sundew.CommandLine/Internal/Options/NestingOption.cs b/Source/Sundew.CommandLine/Internal/Options/NestingOption.cs
index 604b132..e881e28 100644
--- a/Source/Sundew.CommandLine/Internal/Options/NestingOption.cs
+++ b/Source/Sundew.CommandLine/Internal/Options/NestingOption.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NestingOption.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="NestingOption.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.Internal.Options;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.Internal.Helpers;
 
 internal class NestingOption<TOptions> : IOption
@@ -77,7 +77,7 @@ public R<bool, GeneratorError> SerializeTo(StringBuilder stringBuilder, Settings
 
             if (result.IsSuccess)
             {
-                return result.To(true);
+                return result.With(true);
             }
 
             var error = result.Error;
@@ -87,8 +87,8 @@ public R<bool, GeneratorError> SerializeTo(StringBuilder stringBuilder, Settings
                     this,
                     string.Format(settings.CultureInfo, Constants.NestedArgumentSerializationFormat, this.Usage, this.options, error.SerializationException),
                     error.SerializationException!),
-                GeneratorErrorType.RequiredOptionMissing => result.To(false, innerGeneratorError => new GeneratorError(this, innerGeneratorError)),
-                GeneratorErrorType.InnerGeneratorError => result.To(false, innerGeneratorError => new GeneratorError(this, innerGeneratorError)),
+                GeneratorErrorType.RequiredOptionMissing => result.With(false, innerGeneratorError => new GeneratorError(this, innerGeneratorError)),
+                GeneratorErrorType.InnerGeneratorError => result.With(false, innerGeneratorError => new GeneratorError(this, innerGeneratorError)),
                 _ => throw new ArgumentOutOfRangeException(
                     nameof(error.Type),
                     error.Type,
diff --git a/Source/Sundew.CommandLine/Internal/Options/Option.cs b/Source/Sundew.CommandLine/Internal/Options/Option.cs
index 6ece67f..2a40e00 100644
--- a/Source/Sundew.CommandLine/Internal/Options/Option.cs
+++ b/Source/Sundew.CommandLine/Internal/Options/Option.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Option.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Option.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.Internal.Options;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.Internal.Extensions;
 using Sundew.CommandLine.Internal.Helpers;
 
diff --git a/Source/Sundew.CommandLine/Internal/ReadOnlyMemoryCharEqualityComparer.cs b/Source/Sundew.CommandLine/Internal/ReadOnlyMemoryCharEqualityComparer.cs
index 064afe5..f5880eb 100644
--- a/Source/Sundew.CommandLine/Internal/ReadOnlyMemoryCharEqualityComparer.cs
+++ b/Source/Sundew.CommandLine/Internal/ReadOnlyMemoryCharEqualityComparer.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ReadOnlyMemoryCharEqualityComparer.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ReadOnlyMemoryCharEqualityComparer.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/RequiredChoiceArgumentInfo.cs b/Source/Sundew.CommandLine/Internal/RequiredChoiceArgumentInfo.cs
index e5e8dd4..8f073ef 100644
--- a/Source/Sundew.CommandLine/Internal/RequiredChoiceArgumentInfo.cs
+++ b/Source/Sundew.CommandLine/Internal/RequiredChoiceArgumentInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RequiredChoiceArgumentInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="RequiredChoiceArgumentInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/SpanDelegates.cs b/Source/Sundew.CommandLine/Internal/SpanDelegates.cs
index 93dc52e..f623a66 100644
--- a/Source/Sundew.CommandLine/Internal/SpanDelegates.cs
+++ b/Source/Sundew.CommandLine/Internal/SpanDelegates.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SpanDelegates.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="SpanDelegates.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Switch.cs b/Source/Sundew.CommandLine/Internal/Switch.cs
index c30a2a4..f0ca440 100644
--- a/Source/Sundew.CommandLine/Internal/Switch.cs
+++ b/Source/Sundew.CommandLine/Internal/Switch.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Switch.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Switch.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/TextSizes.cs b/Source/Sundew.CommandLine/Internal/TextSizes.cs
index 8ced8ff..dfe7506 100644
--- a/Source/Sundew.CommandLine/Internal/TextSizes.cs
+++ b/Source/Sundew.CommandLine/Internal/TextSizes.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="TextSizes.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="TextSizes.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Values/ListValue.cs b/Source/Sundew.CommandLine/Internal/Values/ListValue.cs
index e20c88e..bdd10b6 100644
--- a/Source/Sundew.CommandLine/Internal/Values/ListValue.cs
+++ b/Source/Sundew.CommandLine/Internal/Values/ListValue.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ListValue.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ListValue.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -12,8 +12,8 @@ namespace Sundew.CommandLine.Internal.Values;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using Sundew.Base;
 using Sundew.Base.Collections;
-using Sundew.Base.Primitives.Computation;
 using Sundew.Base.Text;
 using Sundew.CommandLine.Internal.Helpers;
 
diff --git a/Source/Sundew.CommandLine/Internal/Values/Value.cs b/Source/Sundew.CommandLine/Internal/Values/Value.cs
index d75affd..58d51a2 100644
--- a/Source/Sundew.CommandLine/Internal/Values/Value.cs
+++ b/Source/Sundew.CommandLine/Internal/Values/Value.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Value.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Value.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.Internal.Values;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Base.Text;
 using Sundew.CommandLine.Internal.Extensions;
 using Sundew.CommandLine.Internal.Helpers;
diff --git a/Source/Sundew.CommandLine/Internal/Values/ValueRegistry.cs b/Source/Sundew.CommandLine/Internal/Values/ValueRegistry.cs
index 0e78520..8f880c5 100644
--- a/Source/Sundew.CommandLine/Internal/Values/ValueRegistry.cs
+++ b/Source/Sundew.CommandLine/Internal/Values/ValueRegistry.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ValueRegistry.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ValueRegistry.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -13,7 +13,7 @@ namespace Sundew.CommandLine.Internal.Values;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.CommandLine.Internal.Helpers;
 
 internal class ValueRegistry : IEnumerable<IValue>
diff --git a/Source/Sundew.CommandLine/Internal/Verbs/IVerbRegistry.cs b/Source/Sundew.CommandLine/Internal/Verbs/IVerbRegistry.cs
index 54156df..5a86052 100644
--- a/Source/Sundew.CommandLine/Internal/Verbs/IVerbRegistry.cs
+++ b/Source/Sundew.CommandLine/Internal/Verbs/IVerbRegistry.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IVerbRegistry.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="IVerbRegistry.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Verbs/NullVerb.cs b/Source/Sundew.CommandLine/Internal/Verbs/NullVerb.cs
index 5fc739d..fa4c5ca 100644
--- a/Source/Sundew.CommandLine/Internal/Verbs/NullVerb.cs
+++ b/Source/Sundew.CommandLine/Internal/Verbs/NullVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NullVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="NullVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Internal/Verbs/VerbRegistry.cs b/Source/Sundew.CommandLine/Internal/Verbs/VerbRegistry.cs
index 7a64648..f7ea0ab 100644
--- a/Source/Sundew.CommandLine/Internal/Verbs/VerbRegistry.cs
+++ b/Source/Sundew.CommandLine/Internal/Verbs/VerbRegistry.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VerbRegistry.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="VerbRegistry.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,7 +11,7 @@ namespace Sundew.CommandLine.Internal.Verbs;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 using Sundew.Base.Text;
 using Sundew.CommandLine.Internal.Helpers;
 
diff --git a/Source/Sundew.CommandLine/ParserError.cs b/Source/Sundew.CommandLine/ParserError.cs
index 2cbe061..b679bb9 100644
--- a/Source/Sundew.CommandLine/ParserError.cs
+++ b/Source/Sundew.CommandLine/ParserError.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ParserError.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ParserError.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/ParserErrorType.cs b/Source/Sundew.CommandLine/ParserErrorType.cs
index aa29e7d..a5056e0 100644
--- a/Source/Sundew.CommandLine/ParserErrorType.cs
+++ b/Source/Sundew.CommandLine/ParserErrorType.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ParserErrorType.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ParserErrorType.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/ParserError{TInfo}.cs b/Source/Sundew.CommandLine/ParserError{TInfo}.cs
index 5fee59b..cd6617c 100644
--- a/Source/Sundew.CommandLine/ParserError{TInfo}.cs
+++ b/Source/Sundew.CommandLine/ParserError{TInfo}.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ParserError{TInfo}.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ParserError{TInfo}.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Properties/AssemblyInfo.cs b/Source/Sundew.CommandLine/Properties/AssemblyInfo.cs
index 685d3d9..19d4891 100644
--- a/Source/Sundew.CommandLine/Properties/AssemblyInfo.cs
+++ b/Source/Sundew.CommandLine/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="AssemblyInfo.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/ResultExtensions.cs b/Source/Sundew.CommandLine/ResultExtensions.cs
index ebf8315..80ecb31 100644
--- a/Source/Sundew.CommandLine/ResultExtensions.cs
+++ b/Source/Sundew.CommandLine/ResultExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ResultExtensions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ResultExtensions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 namespace Sundew.CommandLine;
 
 using System;
-using Sundew.Base.Primitives.Computation;
+using Sundew.Base;
 
 /// <summary>Contains extension methods for command line parser results.</summary>
 public static class ResultExtensions
diff --git a/Source/Sundew.CommandLine/Separators.cs b/Source/Sundew.CommandLine/Separators.cs
index 8a02a6f..74c4d25 100644
--- a/Source/Sundew.CommandLine/Separators.cs
+++ b/Source/Sundew.CommandLine/Separators.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Separators.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Separators.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/SerializationException.cs b/Source/Sundew.CommandLine/SerializationException.cs
index 2a69db6..7f6b380 100644
--- a/Source/Sundew.CommandLine/SerializationException.cs
+++ b/Source/Sundew.CommandLine/SerializationException.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SerializationException.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="SerializationException.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Settings.cs b/Source/Sundew.CommandLine/Settings.cs
index 4f9fb1e..617a9c8 100644
--- a/Source/Sundew.CommandLine/Settings.cs
+++ b/Source/Sundew.CommandLine/Settings.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Settings.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Settings.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.CommandLine/Sundew.CommandLine.csproj b/Source/Sundew.CommandLine/Sundew.CommandLine.csproj
index 40f2b22..dc29b18 100644
--- a/Source/Sundew.CommandLine/Sundew.CommandLine.csproj
+++ b/Source/Sundew.CommandLine/Sundew.CommandLine.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <Authors>Kim Hugener-Ohlsen</Authors>
-    <Company>Hukano</Company>
+    <Company>Sundews</Company>
     <DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
     <Description>Simple library for creating a command line.
 Features:
@@ -54,14 +54,14 @@ Features:
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Sundew.Base.Collections" Version="11.0.5" />
-    <PackageReference Include="Sundew.Base.Primitives" Version="11.0.5" />
-    <PackageReference Include="Sundew.Base.Text" Version="11.0.5" />
-    <PackageReference Include="Sundew.Packaging.Publish" Version="10.0.2">
+    <PackageReference Include="Sundew.Base.Collections" Version="12.0.1" />
+    <PackageReference Include="Sundew.Base.Primitives" Version="12.0.1" />
+    <PackageReference Include="Sundew.Base.Text" Version="12.0.1" />
+    <PackageReference Include="Sundew.Packaging.Publish" Version="10.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Source/Sundew.CommandLine/stylecop.json b/Source/Sundew.CommandLine/stylecop.json
index 176b200..42b9d94 100644
--- a/Source/Sundew.CommandLine/stylecop.json
+++ b/Source/Sundew.CommandLine/stylecop.json
@@ -8,7 +8,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "Hukano",
+      "companyName": "Sundews",
       "xmlHeader": true,
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information.",
       "headerDecoration": "--------------------------------------------------------------------------------------------------------------------",
diff --git a/Source/Sundew.Git.CommandLine/Add.cs b/Source/Sundew.Git.CommandLine/Add.cs
index d6f5e93..05b12b5 100644
--- a/Source/Sundew.Git.CommandLine/Add.cs
+++ b/Source/Sundew.Git.CommandLine/Add.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Add.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Add.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Commit.cs b/Source/Sundew.Git.CommandLine/Commit.cs
index 63989df..a6ef03f 100644
--- a/Source/Sundew.Git.CommandLine/Commit.cs
+++ b/Source/Sundew.Git.CommandLine/Commit.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Commit.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Commit.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/CommonOptions.cs b/Source/Sundew.Git.CommandLine/CommonOptions.cs
index 7c00a02..d7676f9 100644
--- a/Source/Sundew.Git.CommandLine/CommonOptions.cs
+++ b/Source/Sundew.Git.CommandLine/CommonOptions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CommonOptions.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="CommonOptions.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Init.cs b/Source/Sundew.Git.CommandLine/Init.cs
index cb6bf7c..e6ff034 100644
--- a/Source/Sundew.Git.CommandLine/Init.cs
+++ b/Source/Sundew.Git.CommandLine/Init.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Init.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Init.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/LargeFileSystem/ILfsVerb.cs b/Source/Sundew.Git.CommandLine/LargeFileSystem/ILfsVerb.cs
index 962c4d3..f3209c9 100644
--- a/Source/Sundew.Git.CommandLine/LargeFileSystem/ILfsVerb.cs
+++ b/Source/Sundew.Git.CommandLine/LargeFileSystem/ILfsVerb.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ILfsVerb.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="ILfsVerb.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/LargeFileSystem/Install.cs b/Source/Sundew.Git.CommandLine/LargeFileSystem/Install.cs
index e883510..081c563 100644
--- a/Source/Sundew.Git.CommandLine/LargeFileSystem/Install.cs
+++ b/Source/Sundew.Git.CommandLine/LargeFileSystem/Install.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Install.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Install.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/LargeFileSystem/Lfs.cs b/Source/Sundew.Git.CommandLine/LargeFileSystem/Lfs.cs
index 42e8c99..e4a92bf 100644
--- a/Source/Sundew.Git.CommandLine/LargeFileSystem/Lfs.cs
+++ b/Source/Sundew.Git.CommandLine/LargeFileSystem/Lfs.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Lfs.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Lfs.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/LargeFileSystem/Track.cs b/Source/Sundew.Git.CommandLine/LargeFileSystem/Track.cs
index 097659f..e6a95d6 100644
--- a/Source/Sundew.Git.CommandLine/LargeFileSystem/Track.cs
+++ b/Source/Sundew.Git.CommandLine/LargeFileSystem/Track.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Track.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Track.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/LargeFileSystem/Untrack.cs b/Source/Sundew.Git.CommandLine/LargeFileSystem/Untrack.cs
index f0605c5..d0423bb 100644
--- a/Source/Sundew.Git.CommandLine/LargeFileSystem/Untrack.cs
+++ b/Source/Sundew.Git.CommandLine/LargeFileSystem/Untrack.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Untrack.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Untrack.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Push.cs b/Source/Sundew.Git.CommandLine/Push.cs
index 7b795c1..a74b599 100644
--- a/Source/Sundew.Git.CommandLine/Push.cs
+++ b/Source/Sundew.Git.CommandLine/Push.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Push.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Push.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Refspec.cs b/Source/Sundew.Git.CommandLine/Refspec.cs
index 6f5010f..d4d6771 100644
--- a/Source/Sundew.Git.CommandLine/Refspec.cs
+++ b/Source/Sundew.Git.CommandLine/Refspec.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Refspec.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Refspec.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Repository.cs b/Source/Sundew.Git.CommandLine/Repository.cs
index 0bad72b..8823a9e 100644
--- a/Source/Sundew.Git.CommandLine/Repository.cs
+++ b/Source/Sundew.Git.CommandLine/Repository.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Repository.cs" company="Hukano">
-// Copyright (c) Hukano. All rights reserved.
+// <copyright file="Repository.cs" company="Sundews">
+// Copyright (c) Sundews. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/Source/Sundew.Git.CommandLine/Sundew.Git.CommandLine.csproj b/Source/Sundew.Git.CommandLine/Sundew.Git.CommandLine.csproj
index cf48db6..3b5f866 100644
--- a/Source/Sundew.Git.CommandLine/Sundew.Git.CommandLine.csproj
+++ b/Source/Sundew.Git.CommandLine/Sundew.Git.CommandLine.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Source/Sundew.Git.CommandLine/stylecop.json b/Source/Sundew.Git.CommandLine/stylecop.json
index 176b200..42b9d94 100644
--- a/Source/Sundew.Git.CommandLine/stylecop.json
+++ b/Source/Sundew.Git.CommandLine/stylecop.json
@@ -8,7 +8,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "Hukano",
+      "companyName": "Sundews",
       "xmlHeader": true,
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information.",
       "headerDecoration": "--------------------------------------------------------------------------------------------------------------------",