diff --git a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs
index ac7fe4b403..48bfbe3cf4 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs
@@ -35,7 +35,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.Centre,
                 Children = new Drawable[]
                 {
-                    new Framework.Graphics.Sprites.Box
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.Green,
@@ -98,7 +98,7 @@ namespace osu.Desktop.VisualTests.Tests
 
         private class MyContextMenuContainer : Container, IHasContextMenu
         {
-            public ContextMenuItem[] ContextMenuItems => new[]
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
             {
                 new OsuContextMenuItem(@"Some option"),
                 new OsuContextMenuItem(@"Highlighted option", ContextMenuType.Highlighted),
@@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests
 
         private class AnotherContextMenuContainer : Container, IHasContextMenu
         {
-            public ContextMenuItem[] ContextMenuItems => new[]
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
             {
                 new OsuContextMenuItem(@"Simple option"),
                 new OsuContextMenuItem(@"Simple very very long option"),
diff --git a/osu.Game/Graphics/UserInterface/ContextMenuType.cs b/osu.Game/Graphics/ContextMenuType.cs
similarity index 100%
rename from osu.Game/Graphics/UserInterface/ContextMenuType.cs
rename to osu.Game/Graphics/ContextMenuType.cs
diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
index a9b4975552..f5786598bf 100644
--- a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleClick;
         private SampleChannel sampleHover;
 
-        private ContextMenuType type;
+        private readonly ContextMenuType type;
 
         protected override Container CreateTextContainer(string title) => new Container
         {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fd7bbe058f..8ffbf75139 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -76,7 +76,7 @@
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />
     <Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
-    <Compile Include="Graphics\UserInterface\ContextMenuType.cs" />
+    <Compile Include="Graphics\ContextMenuType.cs" />
     <Compile Include="Graphics\UserInterface\IconButton.cs" />
     <Compile Include="Configuration\SelectionRandomType.cs" />
     <Compile Include="Graphics\UserInterface\OsuContextMenu.cs" />