diff --git a/src/Cake.GitLabCI.Module/AnsiEscapeCodes.cs b/src/Cake.GitLabCI.Module/AnsiEscapeCodes.cs
index db030c7d..14e975e9 100644
--- a/src/Cake.GitLabCI.Module/AnsiEscapeCodes.cs
+++ b/src/Cake.GitLabCI.Module/AnsiEscapeCodes.cs
@@ -1,4 +1,4 @@
-namespace Cake.AzurePipelines.Module
+namespace Cake.GitLabCI.Module
 {
     internal static class AnsiEscapeCodes
     {
diff --git a/src/Cake.GitLabCI.Module/GitLabCILog.cs b/src/Cake.GitLabCI.Module/GitLabCILog.cs
index 32af678c..f5f9e162 100644
--- a/src/Cake.GitLabCI.Module/GitLabCILog.cs
+++ b/src/Cake.GitLabCI.Module/GitLabCILog.cs
@@ -6,7 +6,7 @@
 
 using JetBrains.Annotations;
 
-namespace Cake.AzurePipelines.Module
+namespace Cake.GitLabCI.Module
 {
     /// <summary>
     /// <see cref="ICakeLog"/> implementation for GitLab CI.
diff --git a/src/Cake.GitLabCI.Module/GitLabCIModule.Obsolete.cs b/src/Cake.GitLabCI.Module/GitLabCIModule.Obsolete.cs
new file mode 100644
index 00000000..2c8425c3
--- /dev/null
+++ b/src/Cake.GitLabCI.Module/GitLabCIModule.Obsolete.cs
@@ -0,0 +1,20 @@
+using System;
+
+using Cake.Core.Composition;
+
+namespace Cake.AzurePipelines.Module
+{
+    /// <summary>
+    /// Legacy <see cref="ICakeModule"/> implementation for GitLab CI.
+    /// </summary>
+    /// <remarks>
+    /// When <see cref="GitLabCIModule"/> was introduced initially, it was placed in the <c>Cake.AzurePipelines.Module</c> namespace by accident.
+    /// <para>
+    /// The namespace has since been adjusted, but this class is still provided in the <c>Cake.AzurePipelines.Module</c> namespace for backwards compatibility in Cake.Frosting projects.
+    /// When possible, use <see cref="GitLabCI.Module.GitLabCIModule"/> instead.
+    /// </para>
+    /// </remarks>
+    [Obsolete($"Use {nameof(GitLabCIModule)} from namespace Cake.GitLabCI.Module instead")]
+    public class GitLabCIModule : GitLabCI.Module.GitLabCIModule
+    { }
+}
diff --git a/src/Cake.GitLabCI.Module/GitLabCIModule.cs b/src/Cake.GitLabCI.Module/GitLabCIModule.cs
index b3de95e3..6f78824c 100644
--- a/src/Cake.GitLabCI.Module/GitLabCIModule.cs
+++ b/src/Cake.GitLabCI.Module/GitLabCIModule.cs
@@ -4,9 +4,9 @@
 using Cake.Core.Composition;
 using Cake.Core.Diagnostics;
 
-[assembly: CakeModule(typeof(Cake.AzurePipelines.Module.GitLabCIModule))]
+[assembly: CakeModule(typeof(Cake.GitLabCI.Module.GitLabCIModule))]
 
-namespace Cake.AzurePipelines.Module
+namespace Cake.GitLabCI.Module
 {
     /// <summary>
     /// <see cref="ICakeModule"/> implementation for GitLab CI.