diff --git a/VersionAssemblyInfo.cs b/VersionAssemblyInfo.cs
deleted file mode 100644
index 63d09a1..0000000
--- a/VersionAssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Cake.
-// </auto-generated>
-//------------------------------------------------------------------------------
-using System.Reflection;
-
-[assembly: AssemblyVersion("0.12.0.0")]
-[assembly: AssemblyFileVersion("0.12.0.0")]
-[assembly: AssemblyInformationalVersion("0.12.0+Branch.feature/76.Sha.b3a5b4c52bd34fcafe836218600aa90cd3df975e")]
-
diff --git a/src/Cake.Npm.Tests/Ci/NpmCiToolTests.cs b/src/Cake.Npm.Tests/Ci/NpmCiToolTests.cs
index 15ae321..2ee4de0 100644
--- a/src/Cake.Npm.Tests/Ci/NpmCiToolTests.cs
+++ b/src/Cake.Npm.Tests/Ci/NpmCiToolTests.cs
@@ -1,6 +1,6 @@
 using System;
 using Cake.Core.Diagnostics;
-using Cake.Npm.Install;
+using Cake.Npm.Ci;
 using Xunit;
 
 namespace Cake.Npm.Tests.Ci
diff --git a/src/Cake.Npm.Tests/Set/NpmSetToolTests.cs b/src/Cake.Npm.Tests/Set/NpmSetToolTests.cs
index c7f91bd..e30e047 100644
--- a/src/Cake.Npm.Tests/Set/NpmSetToolTests.cs
+++ b/src/Cake.Npm.Tests/Set/NpmSetToolTests.cs
@@ -6,7 +6,7 @@ namespace Cake.Npm.Tests.Set
 {
     public class NpmSetToolTests
     {
-        public sealed class TheAutomatedInstallMethod
+        public sealed class TheSetMethod
         {
             [Fact]
             public void Should_Redirect_Standard_Error()
diff --git a/src/Cake.Npm.Tests/Update/NpmUpdateToolTests.cs b/src/Cake.Npm.Tests/Update/NpmUpdateToolTests.cs
index 2292b56..0f8df5d 100644
--- a/src/Cake.Npm.Tests/Update/NpmUpdateToolTests.cs
+++ b/src/Cake.Npm.Tests/Update/NpmUpdateToolTests.cs
@@ -5,7 +5,7 @@ namespace Cake.Npm.Tests.Update
 {
     public class NpmUpdateToolTests
     {
-        public sealed class TheAutomatedInstallMethod
+        public sealed class TheUpdateMethod
         {
             [Fact]
             public void Should_Redirect_Standard_Error()
diff --git a/src/Cake.Npm.Tests/Version/NpmVersionToolTests.cs b/src/Cake.Npm.Tests/Version/NpmVersionToolTests.cs
index 2d0da73..f1ec8b3 100644
--- a/src/Cake.Npm.Tests/Version/NpmVersionToolTests.cs
+++ b/src/Cake.Npm.Tests/Version/NpmVersionToolTests.cs
@@ -6,7 +6,7 @@ namespace Cake.Npm.Tests.Version
 {
     public class NpmVersionToolTests
     {
-        public sealed class TheAutomatedInstallMethod
+        public sealed class TheVersionMethod
         {
             [Fact]
             public void Should_Throw_If_Settings_Are_Null()
diff --git a/src/Cake.Npm/Ci/NpmCiSettings.cs b/src/Cake.Npm/Ci/NpmCiSettings.cs
index 54e2a0b..19e1103 100644
--- a/src/Cake.Npm/Ci/NpmCiSettings.cs
+++ b/src/Cake.Npm/Ci/NpmCiSettings.cs
@@ -21,10 +21,7 @@ public NpmCiSettings()
         /// </summary>
         public bool Production { get; set; }
 
-        /// <summary>
-        /// Evaluates the settings and writes them to <paramref name="args"/>.
-        /// </summary>
-        /// <param name="args">The argument builder into which the settings should be written.</param>
+        /// <inheritdoc />
         protected override void EvaluateCore(ProcessArgumentBuilder args)
         {
             base.EvaluateCore(args);
diff --git a/src/Cake.Npm/Ci/NpmCiSettingsExtensions.cs b/src/Cake.Npm/Ci/NpmCiSettingsExtensions.cs
index 4eed841..6e9ae67 100644
--- a/src/Cake.Npm/Ci/NpmCiSettingsExtensions.cs
+++ b/src/Cake.Npm/Ci/NpmCiSettingsExtensions.cs
@@ -1,6 +1,6 @@
 using Cake.Npm.Ci;
 
-namespace Cake.Npm.Install
+namespace Cake.Npm.Ci
 {
     using System;
     using Core;
diff --git a/src/Cake.Npm/Namespaces.cs b/src/Cake.Npm/Namespaces.cs
index 8334205..fe1572b 100644
--- a/src/Cake.Npm/Namespaces.cs
+++ b/src/Cake.Npm/Namespaces.cs
@@ -59,3 +59,51 @@ internal class NamespaceDoc
     {
     }
 }
+
+// ReSharper disable once CheckNamespace
+namespace Cake.Npm.Ci
+{
+    /// <summary>
+    /// This namespace contain types used for install npm packages (using CI commands).
+    /// </summary>
+    [CompilerGenerated]
+    internal class NamespaceDoc
+    {
+    }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Cake.Npm.Set
+{
+    /// <summary>
+    /// This namespace contain types used for managing npm config settings.
+    /// </summary>
+    [CompilerGenerated]
+    internal class NamespaceDoc
+    {
+    }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Cake.Npm.Version
+{
+    /// <summary>
+    /// This namespace contain types used for determining installed npm version.
+    /// </summary>
+    [CompilerGenerated]
+    internal class NamespaceDoc
+    {
+    }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Cake.Npm.Update
+{
+    /// <summary>
+    /// This namespace contain types used for updating npm packages.
+    /// </summary>
+    [CompilerGenerated]
+    internal class NamespaceDoc
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Cake.Npm/NpmSetAliases.cs b/src/Cake.Npm/NpmSetAliases.cs
index 4df3dfb..70869f4 100644
--- a/src/Cake.Npm/NpmSetAliases.cs
+++ b/src/Cake.Npm/NpmSetAliases.cs
@@ -48,15 +48,14 @@ public static void NpmSet(this ICakeContext context, string key, string value, b
         /// </summary>
         /// <param name="context">The context.</param>
         /// <param name="settings">The settings.</param>
-        /// <param name="key">The key</param>
-        /// <param name="value">The value</param>
-        /// <param name="globally">Set globally</param>
         /// <example>
         /// <para>Use speSetfic log level ('npm Set')</para>
         /// <code>
         /// <![CDATA[
         ///     var settings = new NpmSetSettings();
-        ///     NpmSet(settings, "progress", "false", true);
+        ///     settings.Key = "progress";
+        ///     settings.Value = "false";
+        ///     NpmSet(settings);
         /// ]]>
         /// </code>
         /// </example>
diff --git a/src/Cake.Npm/NpmUpdateAliases.cs b/src/Cake.Npm/NpmUpdateAliases.cs
index eb81333..6ef192f 100644
--- a/src/Cake.Npm/NpmUpdateAliases.cs
+++ b/src/Cake.Npm/NpmUpdateAliases.cs
@@ -36,15 +36,15 @@ public static void NpmUpdate(this ICakeContext context)
         }
 
         /// <summary>
-        /// Updates packages using the speUpdatefied settings.
+        /// Updates all packages for the project in the current working directory.
         /// </summary>
         /// <param name="context">The context.</param>
         /// <param name="settings">The settings.</param>
         /// <example>
-        /// <para>Use speUpdatefic log level ('npm Update')</para>
         /// <code>
         /// <![CDATA[
         ///     var settings = new NpmUpdateSettings();
+        ///     settings.UpdateGlobalPackages();
         ///     NpmUpdate(settings);
         /// ]]>
         /// </code>
diff --git a/src/Cake.Npm/NpmVersionAliases.cs b/src/Cake.Npm/NpmVersionAliases.cs
index 17d73c1..6b16551 100644
--- a/src/Cake.Npm/NpmVersionAliases.cs
+++ b/src/Cake.Npm/NpmVersionAliases.cs
@@ -19,7 +19,7 @@ public static class NpmVersionAliases
         /// <example>
         /// <code>
         /// <![CDATA[
-        ///     NpmVersion();
+        ///     var versionString = NpmVersion();
         /// ]]>
         /// </code>
         /// </example>
@@ -32,40 +32,9 @@ public static string NpmVersion(this ICakeContext context)
                 throw new ArgumentNullException(nameof(context));
             }
             
-            return context.NpmVersion(new NpmVersionSettings());
-        }
-
-        /// <summary>
-        /// Versions packages using the speVersionfied settings.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <param name="settings">The settings.</param>
-        /// <example>
-        /// <para>Use speVersionfic log level ('npm Version')</para>
-        /// <code>
-        /// <![CDATA[
-        ///     var settings = new NpmVersionSettings();
-        ///     NpmVersion(settings);
-        /// ]]>
-        /// </code>
-        /// </example>
-        [CakeMethodAlias]
-        [CakeAliasCategory("Version")]
-        public static string NpmVersion(this ICakeContext context, NpmVersionSettings settings)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            if (settings == null)
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
-
             AddinInformation.LogVersionInformation(context.Log);
-            var VersionTool = new NpmVersionTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log);
-            return VersionTool.Version(settings);
+            var settings =new NpmVersionSettings();
+            return new NpmVersionTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log).Version(settings);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Cake.Npm/Set/NpmSetSettings.cs b/src/Cake.Npm/Set/NpmSetSettings.cs
index c0827db..189982e 100644
--- a/src/Cake.Npm/Set/NpmSetSettings.cs
+++ b/src/Cake.Npm/Set/NpmSetSettings.cs
@@ -32,7 +32,7 @@ public NpmSetSettings()
         /// </summary>
         public bool Global { get; set; }
 
-        /// <inheritdoc cref="NpmSettings.EvaluateCore" />
+        /// <inheritdoc />
         protected override void EvaluateCore(ProcessArgumentBuilder args)
         {
             if (string.IsNullOrWhiteSpace(Key))
diff --git a/src/Cake.Npm/Update/NpmUpdateSettings.cs b/src/Cake.Npm/Update/NpmUpdateSettings.cs
index d73a72c..84e3cfd 100644
--- a/src/Cake.Npm/Update/NpmUpdateSettings.cs
+++ b/src/Cake.Npm/Update/NpmUpdateSettings.cs
@@ -19,12 +19,9 @@ public NpmUpdateSettings()
         /// <summary>
         /// Gets a value indicating whether to update globally installed packages.
         /// </summary>
-        public bool Global { get; internal set; }
-
-        /// <summary>
-        /// Evaluates the settings and writes them to <paramref name="args"/>.
-        /// </summary>
-        /// <param name="args">The argument builder into which the settings should be written.</param>
+        public bool Global { get; internal set; }
+
+        /// <inheritdoc />
         protected override void EvaluateCore(ProcessArgumentBuilder args)
         {
             base.EvaluateCore(args);