diff --git a/osu-framework b/osu-framework
index 92db4fc015..bd8bc234fc 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 92db4fc015274a4b8a74d9adb2d7a68b8be2134c
+Subproject commit bd8bc234fc6014cb18679e5e52da1074f4a4e5be
diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 245b52fc46..23211c5116 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -60,13 +60,13 @@ namespace osu.Desktop.Overlays
                 new FlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     Children = new Drawable[]
                     {
                         new FlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(5)),
+                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(5)),
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Children = new Drawable[]
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
index 42868fffac..545f71567a 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 2));
+            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 2));
             Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
 
             Children = new Drawable[]
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
index def333a2c3..7e8b0068c1 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps.Drawables
                 new FlowContainer
                 {
                     Padding = new MarginPadding(5),
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
@@ -101,13 +101,13 @@ namespace osu.Game.Beatmaps.Drawables
                         new FlowContainer
                         {
                             Padding = new MarginPadding { Left = 5 },
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
                                 new FlowContainer
                                 {
-                                    FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(4, 0)),
+                                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(4, 0)),
                                     AutoSizeAxes = Axes.Both,
                                     Children = new[]
                                     {
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
index 8b3faf59ce..0998423d47 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables
                 },
                 new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                     AutoSizeAxes = Axes.Both,
                     Children = new[]
@@ -112,7 +112,7 @@ namespace osu.Game.Beatmaps.Drawables
                     new FlowContainer
                     {
                         Depth = -1,
-                        FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                         RelativeSizeAxes = Axes.Both,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
index a0a9bd7063..f1f055fb6a 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
             {
                 new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index a6f4186efc..02e778d42b 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Graphics.UserInterface
                 stars = new FlowContainer<Star>
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(star_spacing)),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(star_spacing)),
                 }
             };
 
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
index 178a6b0bc8..6bd4f6542b 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 },
-                    FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(15, 0)),
+                    FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(15, 0)),
                     Children = new Drawable[]
                     {
                         volumeMeterMaster = new VolumeMeter("Master"),
diff --git a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
index 19df21ba8c..d665e39b24 100644
--- a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
+++ b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.Chat.Drawables
                     {
                         flow = new FlowContainer
                         {
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Padding = new MarginPadding { Left = 20, Right = 20 }
diff --git a/osu.Game/Overlays/NotificationManager.cs b/osu.Game/Overlays/NotificationManager.cs
index 4e8c17a0f2..fd57abcb24 100644
--- a/osu.Game/Overlays/NotificationManager.cs
+++ b/osu.Game/Overlays/NotificationManager.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays
                     {
                         sections = new FlowContainer<NotificationSection>
                         {
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                             Children = new []
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 9dfe290fc3..90b142d5ae 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Notifications
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            FlowStrategy = FlowStrategies.GetVerticalFlow();
+            FlowStrategy = FlowStrategies.CreateVerticalFlow();
 
             Padding = new MarginPadding
             {
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Notifications
                             {
                                 Bottom = 5
                             },
-                            FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(5, 0)),
+                            FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(5, 0)),
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Notifications
                     RelativeSizeAxes = Axes.X,
                     LayoutDuration = 150,
                     LayoutEasing = EasingTypes.OutQuart,
-                    FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(3)),
+                    FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(3)),
                 }
             });
         }
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 86556c4ac9..865c51a3b3 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Options
         {
             Items = new KeyValuePair<string, T>[0];
 
-            FlowStrategy = FlowStrategies.GetVerticalFlow();
+            FlowStrategy = FlowStrategies.CreateVerticalFlow();
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
diff --git a/osu.Game/Overlays/Options/OptionSlider.cs b/osu.Game/Overlays/Options/OptionSlider.cs
index 482af3edbe..58635b4345 100644
--- a/osu.Game/Overlays/Options/OptionSlider.cs
+++ b/osu.Game/Overlays/Options/OptionSlider.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Options
 
         public OptionSlider()
         {
-            FlowStrategy = FlowStrategies.GetFillFlow();
+            FlowStrategy = FlowStrategies.CreateFillFlow();
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Padding = new MarginPadding { Right = 5 };
diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs
index e8d2a8af17..7f01ff91d8 100644
--- a/osu.Game/Overlays/Options/OptionsSection.cs
+++ b/osu.Game/Overlays/Options/OptionsSection.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Options
                         FlowContent = new FlowContainer
                         {
                             Margin = new MarginPadding { Top = header_size + header_margin },
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 30)),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 30)),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                         },
diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs
index 27f98f7211..7fbb2ac3b1 100644
--- a/osu.Game/Overlays/Options/OptionsSubsection.cs
+++ b/osu.Game/Overlays/Options/OptionsSubsection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            FlowStrategy = FlowStrategies.GetVerticalFlow();
+            FlowStrategy = FlowStrategies.CreateVerticalFlow();
             AddInternal(new Drawable[]
             {
                 new OsuSpriteText
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Options
                 },
                 content = new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 5)),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 5)),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },
diff --git a/osu.Game/Overlays/Options/Sections/EditorSection.cs b/osu.Game/Overlays/Options/Sections/EditorSection.cs
index ba615cafd1..0484806044 100644
--- a/osu.Game/Overlays/Options/Sections/EditorSection.cs
+++ b/osu.Game/Overlays/Options/Sections/EditorSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
+            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
             Children = new Drawable[]
             {
                 new OsuCheckbox
diff --git a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
index ab1142c564..15d0a480b5 100644
--- a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.Options.Sections.General
             private void load(APIAccess api, OsuConfigManager config)
             {
                 this.api = api;
-                FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 5));
+                FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 5));
                 AutoSizeAxes = Axes.Y;
                 RelativeSizeAxes = Axes.X;
                 Children = new Drawable[]
diff --git a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
index 0b48527bd0..13c479b1ee 100644
--- a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
 
         public MaintenanceSection()
         {
-            FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
+            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
             Children = new Drawable[]
             {
                 new OsuButton
diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs
index 9bf977dc4e..5e262d4109 100644
--- a/osu.Game/Overlays/Options/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
+            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "TODO: Skin preview textures" },
diff --git a/osu.Game/Overlays/Options/Sidebar.cs b/osu.Game/Overlays/Options/Sidebar.cs
index 7c90675295..47b3cfa0ca 100644
--- a/osu.Game/Overlays/Options/Sidebar.cs
+++ b/osu.Game/Overlays/Options/Sidebar.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Options
                             Anchor = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                         }
                     }
                 },
diff --git a/osu.Game/Overlays/OptionsOverlay.cs b/osu.Game/Overlays/OptionsOverlay.cs
index 79645134e0..8aabc98771 100644
--- a/osu.Game/Overlays/OptionsOverlay.cs
+++ b/osu.Game/Overlays/OptionsOverlay.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
 
                             Children = new Drawable[]
                             {
@@ -98,7 +98,7 @@ namespace osu.Game.Overlays
                                 {
                                     AutoSizeAxes = Axes.Y,
                                     RelativeSizeAxes = Axes.X,
-                                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                                     Children = sections,
                                 }
                             }
diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Overlays/Pause/PauseOverlay.cs
index 99732d09d9..198fe2ffef 100644
--- a/osu.Game/Overlays/Pause/PauseOverlay.cs
+++ b/osu.Game/Overlays/Pause/PauseOverlay.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Pause
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 50)),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 50)),
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Children = new Drawable[]
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Pause
                         new FlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 20)),
+                            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 20)),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
                             Children = new Drawable[]
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index a2ce2d03cf..f9dbb6132a 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Toolbar
                 new ToolbarBackground(),
                 new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 5431acec17..245311b739 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Toolbar
                 },
                 Flow = new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(5)),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(5)),
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
@@ -106,7 +106,7 @@ namespace osu.Game.Overlays.Toolbar
                 },
                 tooltipContainer = new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
                     Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
index 3dfb3c0e4e..d499238cf7 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Left = padding, Right = padding },
diff --git a/osu.Game/Screens/GameScreenWhiteBox.cs b/osu.Game/Screens/GameScreenWhiteBox.cs
index 8d79d1e1b9..a4adfd5201 100644
--- a/osu.Game/Screens/GameScreenWhiteBox.cs
+++ b/osu.Game/Screens/GameScreenWhiteBox.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens
                 },
                 childModeButtons = new FlowContainer
                 {
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index ebfeaf5506..8ed5a872e2 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Menu
                         },
                         buttonFlow = new FlowContainerWithOrigin
                         {
-                            FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(-WEDGE_WIDTH, 0)),
+                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(-WEDGE_WIDTH, 0)),
                             Anchor = Anchor.Centre,
                             AutoSizeAxes = Axes.Both,
                             Children = new[]
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 7562b4e5f2..3f345ddfb2 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 2)),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 2)),
                     Children = new Drawable[]
                     {
                         icon = new TextAwesome
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterCollection.cs
index fbd9514208..8772d7d7e4 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterCollection.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play
     {
         public KeyCounterCollection()
         {
-            FlowStrategy = FlowStrategies.GetHorizontalFlow();
+            FlowStrategy = FlowStrategies.CreateHorizontalFlow();
             AutoSizeAxes = Axes.Both;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f8447a3439..52cd41e542 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Play
                         AutoSizeAxes = Axes.Both,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre,
-                        FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                        FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                         Children = new Drawable[]
                         {
                             new OsuSpriteText
diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs
index 861cc63947..4958cbc8e2 100644
--- a/osu.Game/Screens/Ranking/Results.cs
+++ b/osu.Game/Screens/Ranking/Results.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Ranking
                 new FlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     Children = new Drawable[]
                     {
                         new OsuSpriteText
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 8d99048b88..0d77e13118 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Select
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
-                        FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                        FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                         Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select
                             new FlowContainer
                             {
                                 Margin = new MarginPadding { Top = 10 },
-                                FlowStrategy = FlowStrategies.GetHorizontalFlow(),
+                                FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
                                 AutoSizeAxes = Axes.Both,
                                 Children = new []
                                 {
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Select
                             new FlowContainer
                             {
                                 Margin = new MarginPadding { Top = 20 },
-                                FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(40, 0)),
+                                FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(40, 0)),
                                 AutoSizeAxes = Axes.Both,
                                 Children = labels
                             },
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 2aee714233..98eb0e43c0 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Width = 0.4f, // TODO: InnerWidth property or something
-                    FlowStrategy = FlowStrategies.GetVerticalFlow(),
+                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
                     Children = new Drawable[]
                     {
                         searchTextBox = new SearchTextBox {
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Select
                     new FlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(10, 0)),
+                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
                         Children = new Drawable[]
                         {
                             new TabItem
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Select
                     new FlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(10, 0)),
+                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
                         Origin = Anchor.TopRight,
                         Anchor = Anchor.TopRight,
                         Children = new Drawable[]
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 31cea60cdd..23935b0f40 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -98,13 +98,13 @@ namespace osu.Game.Screens.Select
                     Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(padding, 0)),
+                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(padding, 0)),
                     Children = new Drawable[]
                     {
 
                         buttons = new FlowContainer
                         {
-                            FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(0.2f, 0)),
+                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(0.2f, 0)),
                             AutoSizeAxes = Axes.Both,
                         }
                     }