diff --git a/osu.Game.Tests/Visual/TestCaseEditorCompose.cs b/osu.Game.Tests/Visual/TestCaseEditorCompose.cs
index 3e35ff3289..5c53fdfac4 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorCompose.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorCompose.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseEditorCompose : EditorClockTestCase
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) };
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
-            Child = new Compose();
+            Child = new ComposeScreen();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Compose.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
similarity index 98%
rename from osu.Game/Screens/Edit/Compose/Compose.cs
rename to osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index f11bd89ec5..30962d5536 100644
--- a/osu.Game/Screens/Edit/Compose/Compose.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -17,7 +17,7 @@ using OpenTK.Graphics;
 namespace osu.Game.Screens.Edit.Compose
 {
     [Cached(Type = typeof(IPlacementHandler))]
-    public class Compose : EditorScreen, IPlacementHandler
+    public class ComposeScreen : EditorScreen, IPlacementHandler
     {
         private const float vertical_margins = 10;
         private const float horizontal_margins = 20;
diff --git a/osu.Game/Screens/Edit/Design/Design.cs b/osu.Game/Screens/Edit/Design/DesignScreen.cs
similarity index 95%
rename from osu.Game/Screens/Edit/Design/Design.cs
rename to osu.Game/Screens/Edit/Design/DesignScreen.cs
index 4204286f9a..e99e352653 100644
--- a/osu.Game/Screens/Edit/Design/Design.cs
+++ b/osu.Game/Screens/Edit/Design/DesignScreen.cs
@@ -9,9 +9,9 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Design
 {
-    public class Design : EditorScreen
+    public class DesignScreen : EditorScreen
     {
-        public Design()
+        public DesignScreen()
         {
             Add(new Container
             {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 19211e82aa..524f049284 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,6 +17,8 @@ using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
+using osu.Game.Screens.Edit.Compose;
+using osu.Game.Screens.Edit.Design;
 
 namespace osu.Game.Screens.Edit
 {
@@ -166,10 +168,10 @@ namespace osu.Game.Screens.Edit
             switch (mode)
             {
                 case EditorScreenMode.Compose:
-                    currentScreen = new Compose.Compose();
+                    currentScreen = new ComposeScreen();
                     break;
                 case EditorScreenMode.Design:
-                    currentScreen = new Design.Design();
+                    currentScreen = new DesignScreen();
                     break;
                 default:
                     currentScreen = new EditorScreen();